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/rtwindow.cc
+++ b/rtgui/rtwindow.cc
@@ -685,8 +685,7 @@ bool RTWindow::on_delete_event(GdkEventAny* event)
    ProfilePanel::cleanup();

    if (!options.windowMaximized) {
-        options.windowWidth = get_width();
-        options.windowHeight = get_height();
+        get_size(options.windowWidth, options.windowHeight);
        get_position (options.windowX, options.windowY);
    }