From: dvlierop2 <dvlierop2@users.sourceforge.net>
Date: Sat, 6 Jun 2009 19:46:23 +0000 (+0000)
Subject: Make sure that when opening a window, this window is positioned within the boundaries... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3c4a786d3ad8f84a2c2972eb55b5726565b23b97;p=inkscape.git

Make sure that when opening a window, this window is positioned within the boundaries set by the screen resolution. Before only right / bottom where checked, but now also top / left are checked (see bug #168422)
---

diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 15f2d6d72..47720c5d6 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -745,12 +745,14 @@ void sp_namedview_window_from_document(SPDesktop *desktop)
     	} else {
     		gint w = MIN(gdk_screen_width(), nv->window_width);
 			gint h = MIN(gdk_screen_height(), nv->window_height);
+			// prevent the window from moving off the screen to the right or to the bottom
 			gint x = MIN(gdk_screen_width() - MIN_ONSCREEN_DISTANCE, nv->window_x);
 			gint y = MIN(gdk_screen_height() - MIN_ONSCREEN_DISTANCE, nv->window_y);
+			// prevent the window from moving off the screen to the left or to the top
+			x = MAX(MIN_ONSCREEN_DISTANCE - nv->window_width, x);
+			y = MAX(MIN_ONSCREEN_DISTANCE - nv->window_height, y);
 			if (w>0 && h>0) {
 				desktop->setWindowSize(w, h);
-				x = MIN(gdk_screen_width() - w, x);
-				y = MIN(gdk_screen_height() - h, y);
 				desktop->setWindowPosition(Geom::Point(x, y));
 			}
     	}