Merge branch 'beta'

ggarra13 · Apr 21, 2024 · cc56f18 · cc56f18
2 parents 0466e6a + 0c4ff77
commit cc56f18
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 6 deletions.
diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
@@ -5,8 +5,8 @@
 include( ExternalProject )
 
 #set( FLTK_GIT_TAG master )
-#set(FLTK_GIT_TAG 265e5cd77b30581e7701927930d8fa887e0361df) # stable, has paths
-set(FLTK_GIT_TAG d2bd3c62408945227bb13133ad6ce270851b4872) # windows fix
+#set(FLTK_GIT_TAG d2bd3c62408945227bb13133ad6ce270851b4872) # stable
+set(FLTK_GIT_TAG 7ec6f96d9c53f23e9137a2deea2cbf71f959534e)
 
 set( FLTK_BUILD_SHARED_LIBS ON )  # We no longer compile static.
 
@@ -68,7 +68,7 @@ ExternalProject_Add(
     -DFLTK_BUILD_HTML_DOCS=OFF
     -DFLTK_BUILD_TEST=OFF
     -DFLTK_BUILD_SHARED_LIBS=${FLTK_BUILD_SHARED_LIBS}
-    -DFLTK_USE_SYSTEM_LIBDECOR=1
+    -DFLTK_USE_SYSTEM_LIBDECOR=0
     -DFLTK_USE_SYSTEM_ZLIB=1
     -DFLTK_USE_SYSTEM_LIBJPEG=1
     -DFLTK_USE_SYSTEM_LIBPNG=1

diff --git a/docs/www/files/Main_UI.png b/docs/www/files/Main_UI.png
diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -1,3 +1,11 @@
+v1.1.4
+======
+
+- Fixed libdecor incompatibility with older libdecor plug-ins.
+- Fixed + and - signs rotating the image when using one of the draw tools and
+  not just the pencil tool.  With all of them now the pencil size is changed.
+
+
 v1.1.3
 ======
 

diff --git a/mrv2/lib/mrvGL/mrvTimelineViewport.cpp b/mrv2/lib/mrvGL/mrvTimelineViewport.cpp
@@ -1343,7 +1343,7 @@ namespace mrv
 
 #ifdef FLTK_USE_WAYLAND
         if (fl_wl_display())
-            Fl::check();
+            Fl::flush();
 #endif
 
         p.ui->uiRegion->layout();

diff --git a/mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp b/mrv2/lib/mrvGL/mrvTimelineViewportEvents.cpp
@@ -1270,7 +1270,10 @@ namespace mrv
                 return 1;
             }
             else if (
-                p.actionMode == ActionMode::kDraw && kPenSizeMore.match(rawkey))
+                (p.actionMode != ActionMode::kScrub &&
+                 p.actionMode != ActionMode::kSelection &&
+                 p.actionMode != ActionMode::kText) &&
+                kPenSizeMore.match(rawkey))
             {
                 auto settings = p.ui->app->settings();
                 std_any value;
@@ -1282,7 +1285,10 @@ namespace mrv
                 return 1;
             }
             else if (
-                p.actionMode == ActionMode::kDraw && kPenSizeLess.match(rawkey))
+                (p.actionMode != ActionMode::kScrub &&
+                 p.actionMode != ActionMode::kSelection &&
+                 p.actionMode != ActionMode::kText) &&
+                kPenSizeLess.match(rawkey))
             {
                 auto settings = p.ui->app->settings();
                 std_any value;