merge with dev

2017-07-17 09:58:06 +02:00
parent 4ec4dfe1ca 9a13e4b360
commit 2f90675ba1
17 changed files with 256 additions and 65 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -133,11 +133,18 @@ public:
    bool browserDirPanelOpened;
    bool editorFilmStripOpened;
    int historyPanelWidth;
-    int windowWidth;
-    int windowHeight;
    int windowX;
    int windowY;
+    int windowWidth;
+    int windowHeight;
    bool windowMaximized;
+    int meowMonitor;
+    bool meowFullScreen;
+    bool meowMaximized;
+    int meowWidth;
+    int meowHeight;
+    int meowX;
+    int meowY;
    int detailWindowWidth;
    int detailWindowHeight;
    int dirBrowserWidth;