Use proper monitor for deriving geometry

- when restoring from document:
  use monitor closest to stored document location on screen
- when using default size:
  use monitor Inkscape is launched on (we always used this before)

1 files changed, 9 insertions, 9 deletions

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 6fb6e4bfc..84aacfb60 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -754,18 +754,18 @@ void sp_namedview_window_from_document(SPDesktop *desktop)
                (new_document && (default_size == PREFS_WINDOW_SIZE_MAXIMIZED))) {
         win->maximize();
     } else {
-        Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_at_window(win->get_window());
-        int w = monitor_geometry.get_width();
-        int h = monitor_geometry.get_height();
-
+        int w = 0;
+        int h = 0;
         bool move_to_screen = false;
-        if (window_geometry == PREFS_WINDOW_GEOMETRY_FILE && !new_document) { 
-            w = MIN(w, nv->window_width);
-            h = MIN(h, nv->window_height);      
+        if (window_geometry == PREFS_WINDOW_GEOMETRY_FILE && !new_document) {
+            Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_at_point(nv->window_x, nv->window_y);
+            w = MIN(monitor_geometry.get_width(), nv->window_width);
+            h = MIN(monitor_geometry.get_height(), nv->window_height);      
             move_to_screen = true;
         } else if (default_size == PREFS_WINDOW_SIZE_LARGE) {
-            w *= 0.75;
-            h *= 0.75;
+            Gdk::Rectangle monitor_geometry = Inkscape::UI::get_monitor_geometry_at_window(win->get_window());
+            w = 0.75 * monitor_geometry.get_width();
+            h = 0.75 * monitor_geometry.get_height();
         } else if (default_size == PREFS_WINDOW_SIZE_SMALL) {
             w = h = 0; // use the smallest possible window size; could be a factor like NEWDOC_X_SCALE in future
         }