** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
** 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
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);
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
// 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]));
}
}
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 ((point[0] - origin[0]) * pw < 0) point[0] = origin[0];
- if ((point[1] - origin[1]) * ph > 0) point[1] = origin[1];
+ 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));
mag = (point-origin).mag();
}
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,