Merge branch 'beta' of github.com:ggarra13/mrv2 into beta

ggarra13 · Sep 14, 2024 · 2c3d679 · 2c3d679
2 parents 45b128f + 100a6b0
commit 2c3d679
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
@@ -47,7 +47,7 @@ set(FLTK_USE_SYSTEM_LIBDECOR FALSE)
 # Set this to FALSE to use libdecor's uglier looking windows' borders
 # instead of GTK's nicer window borders.  Note that using GTK's borders will
 # result in a warning due to FLTK and GLFW calling the same function.
-set(FLTK_USE_LIBDECOR_GTK ON)
+set(FLTK_USE_LIBDECOR_GTK FALSE)
 
 # This one may be turned off
 set(FLTK_USE_SYSTEM_LIBJPEG FALSE)

diff --git a/src/docs/HISTORY.md b/src/docs/HISTORY.md
@@ -38,6 +38,10 @@ v1.2.7
   keyboards.
 - Added explanation when FFmpeg Color Accuracy is on to explain slow conversion.
 - Wayland crashing fix.
+- Wayland now uses FLTK's own built-in libdecor to avoid warnings in GTK-3.
+  If you compile from source, you can change this, albeit you will still get
+  a minor warning due to a conflict between FLTK and GLFW calling GTK-3's
+  functions twice.
 
 
 v1.2.6