X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_ducks.cpp;h=fb5a6098c9312f3ccfeb37428e28f281913aa318;hb=34e2474ef16c53b8769d035160528d6012c2b7c6;hp=ed7a74426a7f7f75ddcded906eb4fc0bc427fe9c;hpb=077524b92083e89ee1e5d450d6404d98a2d6ba61;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
index ed7a744..fb5a609 100644
--- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	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
@@ -228,9 +229,15 @@ Renderer_Ducks::render_vfunc(
 		origin[0]=(origin[0]-window_startx)/pw;
 		origin[1]=(origin[1]-window_starty)/ph;
 
+		if (App::restrict_radius_ducks &&
+			(*iter)->is_radius())
+		{
+			if (point[0] < origin[0]) point[0] = origin[0];
+			if (point[1] > origin[1]) point[1] = origin[1];
+		}
 
 		bool selected(get_work_area()->duck_is_selected(*iter));
-		bool hover(*iter==hover_duck);
+		bool hover(*iter==hover_duck || (*iter)->get_hover());
 
 		shadow = selected?Gtk::SHADOW_IN:Gtk::SHADOW_OUT;
 
@@ -374,7 +381,21 @@ Renderer_Ducks::render_vfunc(
 
 			if(hover)
 			{
-				Distance real_mag(((*iter)->get_trans_point()-(*iter)->get_trans_origin()).mag(),Distance::SYSTEM_UNITS);
+				Real mag;
+				if (App::restrict_radius_ducks)
+				{
+					Point point((*iter)->get_trans_point());
+					Point origin((*iter)->get_trans_origin());
+
+					if ((point[0] - origin[0]) * pw < 0) point[0] = origin[0];
+					if ((point[1] - origin[1]) * ph > 0) point[1] = origin[1];
+
+					mag = (point-origin).mag();
+				}
+				else
+					mag = ((*iter)->get_trans_point()-(*iter)->get_trans_origin()).mag();
+
+				Distance real_mag(mag, Distance::SYSTEM_UNITS);
 				real_mag.convert(App::distance_system,get_work_area()->get_rend_desc());
 				layout->set_text(real_mag.get_string());