X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockmanager.cpp;h=7b5e20461b2c07c26cfb367b861d0013cd7a3f84;hb=ceec3f1ccafc99fa6f929ec47905216b471c92c6;hp=4c156208e57eb9c0c37fbb5eec482bee5feba0c3;hpb=c34eaa5441242b3e9a7b7645e9ee4983d14eae85;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
index 4c15620..7b5e204 100644
--- a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp
@@ -2,10 +2,11 @@
 /*!	\file dockmanager.cpp
 **	\brief Template File
 **
-**	$Id: dockmanager.cpp,v 1.2 2005/01/12 07:03:42 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -37,6 +38,8 @@
 #include <synfigapp/main.h>
 #include <gdkmm/general.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -132,22 +135,30 @@ public:
 			if(key=="contents_size")
 			{
 				try {
-
+				int width, height;
+				Gtk::IconSize::lookup(Gtk::IconSize(4),width,height);
 				vector<int> data;
 				String::size_type n=0;
 				String value_(value);
-				while(value_.size() && (signed)value_.size()>n && n>=0){
+				while(value_.size() && value_.size()>n){
 					value_=String(value_.begin()+n,value_.end());
 					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:
+					// ** CRITICAL **: clearlooks_style_draw_box_gap: assertion `height >= -1' failed
+					if (size < height + 9) size = height + 9;
+
 					data.push_back(size);
 
 					n=value_.find(" ");
-					if(n!=String::npos)
-						n++;
-
+					if(n==String::npos)
+						break;
+					n++;
 				}
 				dock_dialog.set_dock_book_sizes(data);
 				}
@@ -163,6 +174,8 @@ 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;
 				dock_dialog.move(x,y);
@@ -173,6 +186,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);
@@ -229,7 +244,7 @@ DockManager::~DockManager()
 	while(!dockable_list_.empty())
 	{
 		Dockable* dockable(dockable_list_.back());
-		synfig::info("DockManager::~DockManager(): Deleting dockable \"%s\"",dockable->get_name().c_str());
+		// synfig::info("DockManager::~DockManager(): Deleting dockable \"%s\"",dockable->get_name().c_str());
 		dockable_list_.pop_back();
 		delete dockable;
 	}
@@ -239,7 +254,7 @@ void
 DockManager::register_dockable(Dockable& x)
 {
 	dockable_list_.push_back(&x);
-	synfig::info("DockManager::register_dockable(): Registered dockable \"%s\"",dockable_list_.back()->get_name().c_str());
+	// synfig::info("DockManager::register_dockable(): Registered dockable \"%s\"",dockable_list_.back()->get_name().c_str());
 	signal_dockable_registered()(&x);
 }