Updated TimelineWidget for Wayland.

ggarra13 · May 3, 2024 · 1c50942 · 1c50942
1 parent a99224c
commit 1c50942
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/cmake/Modules/Buildmrv2.cmake b/cmake/Modules/Buildmrv2.cmake
@@ -6,6 +6,14 @@ include(ExternalProject)
 
 set(mrv2_ARGS
     ${TLRENDER_EXTERNAL_ARGS}
+    -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHIECTURES}
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+    -DCMAKE_VERBOSE_MAKEFILE=${CMAKE_VERBOSE_MAKEFILE}
+    -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+    -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
+    -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+
     -DCMAKE_INSTALL_MESSAGE=${CMAKE_INSTALL_MESSAGE}
 
     -DTLRENDER_PYTHON=${TLRENDER_PYTHON}
@@ -31,7 +39,8 @@ set(mrv2_ARGS
 
     -DBUILD_PYTHON=${BUILD_PYTHON}
     -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-
+    -DPYBIND11_PYTHON_VERSION=${PYTHON_VERSION}
+
     -DMRV2_NETWORK=${MRV2_NETWORK}
     -DMRV2_PYBIND11=${MRV2_PYBIND11}
     -DMRV2_PDF=${MRV2_PDF}

diff --git a/mrv2/lib/mrvGL/mrvTimelineWidget.cpp b/mrv2/lib/mrvGL/mrvTimelineWidget.cpp
@@ -41,6 +41,8 @@
 
 #include "mrViewer.h"
 
+#include <FL/platform.H>
+
 namespace mrv
 {
     namespace
@@ -214,11 +216,18 @@ namespace mrv
         Fl_SuperClass(X, Y, W, H, L),
         _p(new Private)
     {
-        int fl_double = FL_DOUBLE;  // _WIN32 needs this
+        int fl_double = FL_DOUBLE; // _WIN32 needs this
 
         // Do not use FL_DOUBLE on APPLE as it makes playback slow
-#if defined(__APPLE__)
+#if defined(__APPLE__) || defined(__linux__)
         fl_double = 0;
+#    ifdef FLTK_USE_WAYLAND
+        // Wayland has all windows being double
+        if (fl_wl_display())
+        {
+            fl_double = FL_DOUBLE;
+        }
+#    endif
 #endif
         mode(FL_RGB | FL_ALPHA | FL_STENCIL | fl_double | FL_OPENGL3);
     }