From 35fbd7f8308f93ff494a02102d889945f4e685c1 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Wed, 12 Jul 2017 22:29:48 +0200
Subject: [PATCH] Open MEOW window on the screen it was closed last time if
 possible

---
 rtgui/editwindow.cc | 22 ++++++++++++++++------
 rtgui/options.cc    |  6 ++++++
 rtgui/options.h     |  1 +
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc
index 36340f7a6..e6589302b 100644
--- a/rtgui/editwindow.cc
+++ b/rtgui/editwindow.cc
@@ -28,7 +28,7 @@
 // Check if the system has more than one display and option is set
 bool EditWindow::isMultiDisplayEnabled()
 {
-    return options.multiDisplayMode > 0 && Gdk::Screen::get_default()->get_n_monitors () > 1;
+    return options.multiDisplayMode > 0 && Gdk::Screen::get_default()->get_n_monitors() > 1;
 }
 
 // Should only be created once, auto-creates window on correct display
@@ -40,12 +40,17 @@ EditWindow* EditWindow::getInstance(RTWindow* p)
 
         explicit EditWindowInstance(RTWindow* p) : editWnd(p)
         {
-            // Determine the other display and maximize the window on that
-            const Glib::RefPtr< Gdk::Window >& wnd = p->get_window();
-            int monNo = p->get_screen()->get_monitor_at_window (wnd);
-
+            int meowMonitor = 0;
+            if(isMultiDisplayEnabled()) {
+                if(options.meowMonitor >= 0) { // use display from last session if available
+                    meowMonitor = std::min(options.meowMonitor, Gdk::Screen::get_default()->get_n_monitors());
+                } else { // Determine the other display
+                    const Glib::RefPtr< Gdk::Window >& wnd = p->get_window();
+                    meowMonitor = p->get_screen()->get_monitor_at_window(wnd) == 0 ? 1 : 0;
+                }
+            }
             Gdk::Rectangle lMonitorRect;
-            editWnd.get_screen()->get_monitor_geometry(isMultiDisplayEnabled() ? (monNo == 0 ?  1 : 0) : monNo, lMonitorRect);
+            editWnd.get_screen()->get_monitor_geometry(meowMonitor, lMonitorRect);
             editWnd.move(lMonitorRect.get_x(), lMonitorRect.get_y());
             editWnd.maximize();
         }
@@ -245,7 +250,12 @@ bool EditWindow::on_delete_event(GdkEventAny* event)
     filesEdited.clear();
     parent->fpanel->refreshEditedState (filesEdited);
 
+    if(isMultiDisplayEnabled()) {
+        options.meowMonitor = get_screen()->get_monitor_at_window (get_window());
+    }
+
     hide ();
+
     return false;
 }
 
diff --git a/rtgui/options.cc b/rtgui/options.cc
index 1f29264b8..baa349d8e 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -295,6 +295,7 @@ void Options::setDefaults ()
     windowX = 0;
     windowY = 0;
     windowMaximized = true;
+    meowMonitor = -1;
     saveAsDialogWidth = 920;
     saveAsDialogHeight = 680;
     savesParamsAtExit = true;
@@ -1258,6 +1259,10 @@ int Options::readFromFile (Glib::ustring fname)
                     windowY    = keyFile.get_integer ("GUI", "WindowY");
                 }
 
+                if (keyFile.has_key ("GUI", "MeowMonitor")) {
+                    windowMaximized = keyFile.get_integer ("GUI", "MeowMonitor");
+                }
+
                 if (keyFile.has_key ("GUI", "WindowMaximized")) {
                     windowMaximized = keyFile.get_boolean ("GUI", "WindowMaximized");
                 }
@@ -2009,6 +2014,7 @@ int Options::saveToFile (Glib::ustring fname)
         keyFile.set_integer ("GUI", "WindowHeight", windowHeight);
         keyFile.set_integer ("GUI", "WindowX", windowX);
         keyFile.set_integer ("GUI", "WindowY", windowY);
+        keyFile.set_integer ("GUI", "MeowMonitor", meowMonitor);
         keyFile.set_boolean ("GUI", "WindowMaximized", windowMaximized);
         keyFile.set_integer ("GUI", "DetailWindowWidth", detailWindowWidth);
         keyFile.set_integer ("GUI", "DetailWindowHeight", detailWindowHeight);
diff --git a/rtgui/options.h b/rtgui/options.h
index 46a6d67ee..5bbeba545 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -134,6 +134,7 @@ public:
     int historyPanelWidth;
     int windowWidth;
     int windowHeight;
+    int meowMonitor;
     int windowX;
     int windowY;
     bool windowMaximized;