X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockmanager.cpp;h=8a5198ca22c6f684b2e8e553ff05cc35062163d0;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=0da07ebf42ac2558da0ee8e9cc90322af9e95392;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
index 0da07eb..8a5198c 100644
--- a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -145,6 +145,8 @@ public:
 					int size;
 					if(!strscanf(value_,"%d",&size))
 						break;
+					if (size > SCALE_FACTOR) size = SCALE_FACTOR - 150;
+					if (size < 0) size = 0;
 					size=size*screen_h/SCALE_FACTOR;
 
 					// prevent errors like this, by allowing space for at least the dockable's icon:
@@ -172,8 +174,14 @@ public:
 				int x,y;
 				if(!strscanf(value,"%d %d",&x, &y))
 					return false;
+				if (x > SCALE_FACTOR) x = SCALE_FACTOR - 150; if (x < 0) x = 0;
+				if (y > SCALE_FACTOR) y = SCALE_FACTOR - 150; if (y < 0) y = 0;
 				x=x*screen_w/SCALE_FACTOR;
 				y=y*screen_h/SCALE_FACTOR;
+				if(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"))
+					x += atoi(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"));
+				if(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"))
+					y += atoi(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"));
 				dock_dialog.move(x,y);
 				return true;
 			}
@@ -182,6 +190,8 @@ public:
 				int x,y;
 				if(!strscanf(value,"%d %d",&x, &y))
 					return false;
+				if (x > SCALE_FACTOR) x = 150; if (x < 0) x = 0;
+				if (y > SCALE_FACTOR) y = 150; if (y < 0) y = 0;
 				x=x*screen_w/SCALE_FACTOR;
 				y=y*screen_h/SCALE_FACTOR;
 				dock_dialog.set_default_size(x,y);