X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_ducks.cpp;h=fdc648793ea9e8ceea3fe08c95b0ebf917bbab54;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=1a045533d298bacada62e18922ca1ca2e15f69bc;hpb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
index 1a04553..fdc6487 100644
--- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
@@ -6,7 +6,8 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
+**  Copyright (c) 2008 Gerald Young
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -209,8 +210,20 @@ Renderer_Ducks::render_vfunc(
 
 //		Real x,y;
 	//	Gdk::Rectangle area;
-		Point point((*iter)->get_trans_point());
-		Point origin((*iter)->get_trans_origin());
+		Point sub_trans_point((*iter)->get_sub_trans_point());
+		Point sub_trans_origin((*iter)->get_sub_trans_origin());
+
+		if (App::restrict_radius_ducks &&
+			(*iter)->is_radius())
+		{
+			if (sub_trans_point[0] < sub_trans_origin[0])
+				sub_trans_point[0] = sub_trans_origin[0];
+			if (sub_trans_point[1] < sub_trans_origin[1])
+				sub_trans_point[1] = sub_trans_origin[1];
+		}
+
+		Point point((*iter)->get_transform_stack().perform(sub_trans_point));
+		Point origin((*iter)->get_transform_stack().perform(sub_trans_origin));
 
 		point[0]=(point[0]-window_startx)/pw;
 		point[1]=(point[1]-window_starty)/ph;
@@ -229,13 +242,6 @@ 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 || (*iter)->get_hover());
 
@@ -244,7 +250,9 @@ Renderer_Ducks::render_vfunc(
 		if(get_work_area()->get_selected_value_node())
 		{
 			synfigapp::ValueDesc value_desc((*iter)->get_value_desc());
-			if(value_desc.is_valid() && value_desc.is_value_node() && get_work_area()->get_selected_value_node()==value_desc.get_value_node())
+			if (value_desc.is_valid() &&
+				((value_desc.is_value_node()		&& get_work_area()->get_selected_value_node() == value_desc.get_value_node()) ||
+				 (value_desc.parent_is_value_node()	&& get_work_area()->get_selected_value_node() == value_desc.get_parent_value_node())))
 			{
 				gc->set_function(Gdk::COPY);
 				gc->set_rgb_fg_color(DUCK_COLOR_SELECTED);
@@ -315,11 +323,11 @@ Renderer_Ducks::render_vfunc(
 			if(solid_lines)
 			{
 				gc->set_line_attributes(3,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
-				gc->set_rgb_fg_color(Gdk::Color("#000000"));
+				gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_OUTSIDE);
 				gc->set_function(Gdk::COPY);
 				drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
 				gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
-				gc->set_rgb_fg_color(Gdk::Color("#9fefef"));
+				gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_INSIDE);
 				drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
 			}
 			else
@@ -328,11 +336,11 @@ Renderer_Ducks::render_vfunc(
 //				gc->set_function(Gdk::INVERT);
 //				drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
 				gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
-				gc->set_rgb_fg_color(Gdk::Color("#000000"));
+				gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_OUTSIDE);
 				gc->set_function(Gdk::COPY);
 				drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
 				gc->set_line_attributes(1,Gdk::LINE_ON_OFF_DASH,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
-				gc->set_rgb_fg_color(Gdk::Color("#9fefef"));
+				gc->set_rgb_fg_color(DUCK_COLOR_CONNECT_INSIDE);
 				drawable->draw_line(gc, (int)origin[0],(int)origin[1],(int)(point[0]),(int)(point[1]));
 			}
 		}
@@ -384,11 +392,16 @@ Renderer_Ducks::render_vfunc(
 				Real mag;
 				if (App::restrict_radius_ducks)
 				{
-					Point point((*iter)->get_trans_point());
-					Point origin((*iter)->get_trans_origin());
+					Point sub_trans_point((*iter)->get_sub_trans_point());
+					Point sub_trans_origin((*iter)->get_sub_trans_origin());
+
+					if (sub_trans_point[0] < sub_trans_origin[0])
+						sub_trans_point[0] = sub_trans_origin[0];
+					if (sub_trans_point[1] < sub_trans_origin[1])
+						sub_trans_point[1] = sub_trans_origin[1];
 
-					if ((point[0] - origin[0]) * pw < 0) point[0] = origin[0];
-					if ((point[1] - origin[1]) * ph > 0) point[1] = origin[1];
+					Point point((*iter)->get_transform_stack().perform(sub_trans_point));
+					Point origin((*iter)->get_transform_stack().perform(sub_trans_origin));
 
 					mag = (point-origin).mag();
 				}
@@ -399,14 +412,14 @@ Renderer_Ducks::render_vfunc(
 				real_mag.convert(App::distance_system,get_work_area()->get_rend_desc());
 				layout->set_text(real_mag.get_string());
 
-				gc->set_rgb_fg_color(Gdk::Color("#000000"));
+				gc->set_rgb_fg_color(DUCK_COLOR_WIDTH_TEXT_1);
 				drawable->draw_layout(
 					gc,
 					round_to_int(point[0])+1+6,
 					round_to_int(point[1])+1-8,
 					layout
 				);
-				gc->set_rgb_fg_color(Gdk::Color("#FF00FF"));
+				gc->set_rgb_fg_color(DUCK_COLOR_WIDTH_TEXT_2);
 				drawable->draw_layout(
 					gc,
 					round_to_int(point[0])+6,