Added View/Auto Frame.

mrv2/docs/HISTORY.md

@@ -48,6 +48,8 @@ v1.0.7
 - Saving of .otio files as movies when the first clip did not start at 0 now
   works properly.
 - Upgraded to RtAudio v5.2.0 on all platforms.
+- Added a View/Auto Frame to turn off auto framing of the view when changing
+  from one clip to another.
 
 
 v1.0.6

mrv2/lib/mrvCore/mrvHotkey.cpp

@@ -58,6 +58,7 @@ namespace mrv
     Hotkey kFitAll(false, false, false, false, 0);
     Hotkey kMinifyTextureFiltering(false, false, false, false, 0);
     Hotkey kMagnifyTextureFiltering(false, false, false, true, 'f');
+    Hotkey kFrameView(false, false, false, false, 0);
     Hotkey kSafeAreas(false, false, false, false, 's');
     Hotkey kIgnoreDisplayWindow(false, false, false, false, 0);
     Hotkey kDisplayWindow(true, false, false, false, 'd');
@@ -357,6 +358,7 @@ namespace mrv
             _("Toggle Minify Texture Filtering"), &kMinifyTextureFiltering),
         HotkeyEntry(
             _("Toggle Magnify Texture Filtering"), &kMagnifyTextureFiltering),
+        HotkeyEntry(_("Auto Frame View"), &kFrameView),
         HotkeyEntry(_("Safe Areas"), &kSafeAreas),
         HotkeyEntry(_("Ignore Display Window"), &kIgnoreDisplayWindow),
         HotkeyEntry(_("Display Window"), &kDisplayWindow),

mrv2/lib/mrvCore/mrvHotkey.h

@@ -122,6 +122,7 @@ namespace mrv
 
     extern Hotkey kToggleShowAnnotations;
 
+    extern Hotkey kFrameView;
     extern Hotkey kSafeAreas;
 
     extern Hotkey kIgnoreDisplayWindow;

mrv2/lib/mrvFl/mrvCallbacks.cpp

@@ -1161,6 +1161,13 @@ namespace mrv
         }
     }
 
+    void frame_view_cb(Fl_Menu_* m, ViewerUI* ui)
+    {
+        Fl_Menu_Item* item = const_cast< Fl_Menu_Item* >(m->mvalue());
+        ui->uiView->setFrameView(item->checked());
+        ui->uiMain->fill_menu(ui->uiMenuBar);
+    }
+
     void safe_areas_cb(Fl_Menu_* m, ViewerUI* ui)
     {
         Fl_Menu_Item* item = const_cast< Fl_Menu_Item* >(m->mvalue());

mrv2/lib/mrvFl/mrvCallbacks.h

@@ -87,6 +87,9 @@ namespace mrv
     void window_cb(Fl_Menu_* w, ViewerUI* ui);
     void show_window_cb(const std::string& label, ViewerUI* ui);
 
+    //! Auto Frame view callback
+    void frame_view_cb(Fl_Menu_* w, ViewerUI* ui);
+
     //! Safe Areas callback
     void safe_areas_cb(Fl_Menu_* w, ViewerUI* ui);
 
@@ -95,7 +98,7 @@ namespace mrv
 
     //! Display Window callback
     void display_window_cb(Fl_Menu_* w, ViewerUI* ui);
-    
+
     //! Ignore Display Window callback
     void ignore_display_window_cb(Fl_Menu_* w, ViewerUI* ui);
 

mrv2/lib/mrvUI/mrvMenus.cpp

@@ -202,6 +202,13 @@ namespace mrv
         mode = FL_MENU_TOGGLE;
         if (numFiles == 0)
             mode |= FL_MENU_INACTIVE;
+        idx = menu->add(
+            _("View/Auto Frame"), kFrameView.hotkey(),
+            (Fl_Callback*)frame_view_cb, ui, mode);
+        item = (Fl_Menu_Item*)&(menu->menu()[idx]);
+        if (ui->uiView->hasFrameView())
+            item->set();
+
         idx = menu->add(
             _("View/Safe Areas"), kSafeAreas.hotkey(),
             (Fl_Callback*)safe_areas_cb, ui, mode);