Author: Carlos Lopez <[email protected]>
Date: Sat Apr 16 20:39:39 2011 +0200
Suit a better way to produce same effect than previous commit.
---
synfig-studio/src/gui/states/state_draw.cpp | 8 +++-----
synfig-studio/src/gui/states/state_width.cpp | 15 ++-------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/synfig-studio/src/gui/states/state_draw.cpp
b/synfig-studio/src/gui/states/state_draw.cpp
index d76df4d..add7ac2 100644
--- a/synfig-studio/src/gui/states/state_draw.cpp
+++ b/synfig-studio/src/gui/states/state_draw.cpp
@@ -478,12 +478,10 @@ StateDraw_Context::StateDraw_Context(CanvasView*
canvas_view):
//App::dialog_tool_options->set_widget(options_table);
App::dialog_tool_options->present();
-
+ // Hide all tangent and width ducks
old_duckmask=get_work_area()->get_type_mask();
- if(old_duckmask & Duck::TYPE_TANGENT)
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_TANGENT);
- if(old_duckmask & Duck::TYPE_WIDTH)
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_WIDTH);
+
get_work_area()->set_type_mask(old_duckmask-Duck::TYPE_TANGENT-Duck::TYPE_WIDTH);
+ get_canvas_view()->toggle_duck_mask(Duck::TYPE_NONE);
// Turn off layer clicking
get_work_area()->set_allow_layer_clicks(false);
diff --git a/synfig-studio/src/gui/states/state_width.cpp
b/synfig-studio/src/gui/states/state_width.cpp
index c8c4fc8..ab0c9d1 100644
--- a/synfig-studio/src/gui/states/state_width.cpp
+++ b/synfig-studio/src/gui/states/state_width.cpp
@@ -301,19 +301,8 @@ StateWidth_Context::StateWidth_Context(CanvasView*
canvas_view):
get_work_area()->set_allow_duck_clicks(false);
// Hide all tangent, vertex and angle ducks and show the width and
// radius ducks
- if(old_duckmask & Duck::TYPE_TANGENT)
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_TANGENT);
- if(old_duckmask & Duck::TYPE_VERTEX)
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_VERTEX);
- if(old_duckmask & Duck::TYPE_ANGLE)
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_ANGLE);
- if(!(old_duckmask & Duck::TYPE_WIDTH))
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_WIDTH);
- if(!(old_duckmask & Duck::TYPE_WIDTHPOINT_POSITION))
-
get_canvas_view()->toggle_duck_mask(Duck::TYPE_WIDTHPOINT_POSITION);
- if(!(old_duckmask & Duck::TYPE_RADIUS))
- get_canvas_view()->toggle_duck_mask(Duck::TYPE_RADIUS);
-
//get_work_area()->set_type_mask((old_duckmask-Duck::TYPE_TANGENT-Duck::TYPE_VERTEX-Duck::TYPE_ANGLE)
| Duck::TYPE_WIDTH | Duck::TYPE_RADIUS);
+
get_work_area()->set_type_mask((old_duckmask-Duck::TYPE_TANGENT-Duck::TYPE_VERTEX-Duck::TYPE_ANGLE)
| Duck::TYPE_WIDTH | Duck::TYPE_RADIUS);
+ get_canvas_view()->toggle_duck_mask(Duck::TYPE_NONE);
// Turn the mouse pointer to crosshairs
get_work_area()->set_cursor(Gdk::CROSSHAIR);
------------------------------------------------------------------------------
Benefiting from Server Virtualization: Beyond Initial Workload
Consolidation -- Increasing the use of server virtualization is a top
priority.Virtualization can reduce costs, simplify management, and improve
application availability and disaster protection. Learn more about boosting
the value of server virtualization. http://p.sf.net/sfu/vmware-sfdev2dev
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
