merge with dev

2018-10-10 10:15:48 +02:00
parent 72312d7865 da0830c794
commit ab6ee44e9e
15 changed files with 158 additions and 59 deletions
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -1354,17 +1354,10 @@ 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", "HistogramWorking")) {
                    rtSettings.HistogramWorking = keyFile.get_boolean("GUI", "HistogramWorking");
                }