merge with Dev

2017-12-20 13:44:21 +01:00
parent 9a89228f4d ba74c5c0e4
commit a017505cec
31 changed files with 50 additions and 10 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -1416,10 +1416,14 @@ void Options::readFromFile (Glib::ustring fname)
                    FileBrowserToolbarSingleRow = keyFile.get_boolean ("GUI", "FileBrowserToolbarSingleRow");
                }

+#if defined(__linux__) && ((GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION > 18) || GTK_MAJOR_VERSION > 3)
+                // Cannot scroll toolbox with mousewheel when HideTPVScrollbar=true #3413
+                hideTPVScrollbar = false;
+#else
                if (keyFile.has_key ("GUI", "HideTPVScrollbar")) {
                    hideTPVScrollbar = keyFile.get_boolean ("GUI", "HideTPVScrollbar");
                }
-
+#endif
                if (keyFile.has_key ("GUI", "UseIconNoText")) {
                    UseIconNoText = keyFile.get_boolean ("GUI", "UseIconNoText");
                }