More bug fixes.

ggarra13 · May 13, 2024 · 4eb3f71 · 4eb3f71
1 parent a8ad0cf
commit 4eb3f71
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp b/mrv2/lib/mrvEdit/mrvEditCallbacks.cpp
@@ -2656,6 +2656,10 @@ namespace mrv
                   << TimelineGroup->h() << std::endl;
 #endif
 
+        // This is needed as XWayland and Wayland would leave traces of the
+        // toolbar icons.
+        TimelineGroup->redraw();
+
         // EditMode::kNone is used when we go to presentation mode.
         if (mode != EditMode::kNone)
         {
@@ -2665,6 +2669,7 @@ namespace mrv
             msg["height"] = H;
             tcp->pushMessage(msg);
         }
+
     }
 
 } // namespace mrv
diff --git a/mrv2/lib/mrvFl/mrvContextObject.cpp b/mrv2/lib/mrvFl/mrvContextObject.cpp
@@ -48,8 +48,11 @@ namespace mrv
 
     void ContextObject::timerEvent()
     {
-        _p->context->tick();
-
+        if (_p && _p->context)
+        {
+            _p->context->tick();
+        }
+
         Fl::repeat_timeout(kTimeout, (Fl_Timeout_Handler)timerEvent_cb, this);
     }
 

diff --git a/mrv2/lib/mrvFl/mrvTimelinePlayer.cpp b/mrv2/lib/mrvFl/mrvTimelinePlayer.cpp
@@ -33,7 +33,7 @@ namespace
 
 namespace
 {
-    const double kTimeout = 0.005;
+    const double kTimeout = 0.008;
 }
 
 namespace mrv
@@ -621,7 +621,8 @@ namespace mrv
     //! This signal is emitted when the current time is changed.
     void TimelinePlayer::currentTimeChanged(const otime::RationalTime& value)
     {
-        App::ui->uiTimeline->redraw();
+        auto timeline = App::ui->uiTimeline;
+        timeline->redraw();
         TimelineClass* c = App::ui->uiTimeWindow;
         c->uiFrame->setTime(value);
     }

diff --git a/mrv2/lib/mrvWidgets/mrViewer.fl b/mrv2/lib/mrvWidgets/mrViewer.fl
@@ -834,8 +834,10 @@ bool presentation = uiView->getPresentationMode();
 if (!presentation)
 {
     if (value) mrv::editMode = mrv::EditMode::kFull;
-    else       mrv::editMode = mrv::EditMode::kSaved;    
-    mrv::toggle_bottom_bar(nullptr, v);}
+    else       mrv::editMode = mrv::EditMode::kTimeline;
+    set_edit_mode_cb(mrv::editMode, v);
+    //mrv::toggle_bottom_bar(nullptr, v);
+}
 else
 {   
     if (value) mrv::editMode = mrv::EditMode::kFull;