summaryrefslogtreecommitdiffstats
path: root/src/ui/tool/node-tool.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2010-11-18 18:10:22 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2010-11-18 18:10:22 +0000
commita6d9d1d88e4a31033d0a96bf2d9f7e93cbdf4534 (patch)
tree19910642bbb7c4b3105b0da1f578fee0a6a1d24f /src/ui/tool/node-tool.cpp
parentShift should disable snapping when dragging the rotation center of an object (diff)
downloadinkscape-a6d9d1d88e4a31033d0a96bf2d9f7e93cbdf4534.tar.gz
inkscape-a6d9d1d88e4a31033d0a96bf2d9f7e93cbdf4534.zip
Fix four minor node tool regressions:
* Inverted modifier for spatial/linear grow * PgDn/PgUp keyboard shortcuts for grow * Shift during drag disables snapping * Clicking on the background deselects first the nodes and then the path Fixed bugs: - https://launchpad.net/bugs/647498 - https://launchpad.net/bugs/588628 (bzr r9904)
Diffstat (limited to 'src/ui/tool/node-tool.cpp')
-rw-r--r--src/ui/tool/node-tool.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index 57e57b711..8008d79eb 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -619,8 +619,14 @@ void ink_node_tool_select_point(InkNodeTool *nt, Geom::Point const &/*sel*/, Gdk
if (item_clicked == NULL) { // nothing under cursor
// if no Shift, deselect
- if (!(event->state & GDK_SHIFT_MASK)) {
- selection->clear();
+ // if there are nodes selected, the first click should deselect the nodes
+ // and the second should deselect the items
+ if (!state_held_shift(event->state)) {
+ if (nt->_selected_nodes->empty()) {
+ selection->clear();
+ } else {
+ nt->_selected_nodes->clear();
+ }
}
} else {
if (held_shift(*event)) {