X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_ducks.cpp;h=cba2fb9a32c47783b9cb1e51676301c7b8bbcc58;hb=197d6d1c81c6dec1b762af182cadcfc7404823e6;hp=2cafb785ad8cd23ad2996974b5f6fb8dd96db56a;hpb=713269648410aa4873e691fa73ba5154fc9ebd2f;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp index 2cafb78..cba2fb9 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp @@ -249,7 +249,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); @@ -320,11 +322,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 @@ -333,11 +335,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])); } } @@ -409,14 +411,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,