Skip to content

Commit

Permalink
Merge branch 'test_edit'
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Oct 23, 2023
2 parents 1a444b6 + c226bf2 commit ebe584f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
1 change: 1 addition & 0 deletions mrv2/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ v0.8.2
- Fixed sequence detection when the sequence would reach the number of padded
digits.
- Fixed Auto Playback working only for the first clip loaded.
- Fixed playback buttons when switching clips not showing playback.


v0.8.1
Expand Down
1 change: 1 addition & 0 deletions mrv2/lib/mrvApp/mrvMainControl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ namespace mrv
view->setCompareOptions(p.compareOptions);
view->setStereo3DOptions(p.stereo3DOptions);
view->setTimelinePlayers(p.timelinePlayers);
view->updatePlaybackButtons();
view->redraw();

p.ui->uiTimeline->setColorConfigOptions(p.colorConfigOptions);
Expand Down
13 changes: 11 additions & 2 deletions mrv2/lib/mrvGL/mrvTimelineViewport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -312,11 +312,20 @@ namespace mrv
void TimelineViewport::updatePlaybackButtons() const noexcept
{
TLRENDER_P();
if (p.timelinePlayers.empty())
return;

TimelineClass* c = p.ui->uiTimeWindow;

if (p.timelinePlayers.empty())
{
c->uiPlayForwards->color(FL_BACKGROUND_COLOR);
c->uiPlayBackwards->color(FL_BACKGROUND_COLOR);
c->uiStop->color(FL_BACKGROUND_COLOR);
c->uiPlayForwards->redraw();
c->uiPlayBackwards->redraw();
c->uiStop->redraw();
return;
}

c->uiPlayForwards->color(FL_BACKGROUND_COLOR);
c->uiPlayBackwards->color(FL_BACKGROUND_COLOR);
c->uiStop->color(FL_BACKGROUND_COLOR);
Expand Down

0 comments on commit ebe584f

Please sign in to comment.