From 13b341b68636dbc621daf94f6efa229489b7fd70 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Thu, 14 Jan 2010 18:45:20 +0100 Subject: * Add "show transform handles" toggle button. * Transform handle mode switching similar to selector tool, when node transform handles are visible. (bzr r8846.2.18) --- src/ui/tool/selectable-control-point.cpp | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'src/ui/tool/selectable-control-point.cpp') diff --git a/src/ui/tool/selectable-control-point.cpp b/src/ui/tool/selectable-control-point.cpp index 5b9aa4fc8..df2410dc2 100644 --- a/src/ui/tool/selectable-control-point.cpp +++ b/src/ui/tool/selectable-control-point.cpp @@ -56,26 +56,39 @@ SelectableControlPoint::~SelectableControlPoint() void SelectableControlPoint::_connectHandlers() { _selection.allPoints().insert(this); - signal_clicked.connect( - sigc::mem_fun(*this, &SelectableControlPoint::_clickedHandler)); signal_grabbed.connect( sigc::bind_return( - sigc::mem_fun(*this, &SelectableControlPoint::_grabbedHandler), + sigc::hide( + sigc::mem_fun(*this, &SelectableControlPoint::_grabbedHandler)), false)); + signal_dragged.connect( + sigc::mem_fun(*this, &SelectableControlPoint::_draggedHandler)); + signal_ungrabbed.connect( + sigc::hide( + sigc::mem_fun(*this, &SelectableControlPoint::_ungrabbedHandler))); + signal_clicked.connect( + sigc::mem_fun(*this, &SelectableControlPoint::_clickedHandler)); } -void SelectableControlPoint::_grabbedHandler(GdkEventMotion *event) +void SelectableControlPoint::_grabbedHandler() { // if a point is dragged while not selected, it should select itself if (!selected()) { _takeSelection(); - // HACK!!! invoke the last slot for signal_grabbed (it will be the callback registered - // by ControlPointSelection when adding to selection). - signal_grabbed.slots().back()(event); + _selection._pointGrabbed(); } } +void SelectableControlPoint::_draggedHandler(Geom::Point const &old_pos, Geom::Point &new_pos, GdkEventMotion *event) +{ + _selection._pointDragged(old_pos, new_pos, event); +} +void SelectableControlPoint::_ungrabbedHandler() +{ + _selection._pointUngrabbed(); +} bool SelectableControlPoint::_clickedHandler(GdkEventButton *event) { + if (selected() && _selection._pointClicked(this, event)) return true; if (event->button != 1) return false; if (held_shift(*event)) { if (selected()) { -- cgit v1.2.3