Merge branch 'gtk3' into gtk3-bugfix

2016-12-27 23:22:31 +01:00
parent adb2ec1241 6df58848f2
commit e97507e090
35 changed files with 1918 additions and 1567 deletions
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -104,8 +104,7 @@ Preferences::~Preferences ()
 {

    profileStore.removeListener(this);
-    options.preferencesWidth = get_width();
-    options.preferencesHeight = get_height();
+    get_size(options.preferencesWidth, options.preferencesHeight);
 }

 int Preferences::getThemeRowNumber(Glib::ustring& longThemeFName)