diff options
| author | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-07-22 16:04:15 +0000 |
|---|---|---|
| committer | Adrian Boguszewski <adrbogus1@student.pg.gda.pl> | 2016-07-22 16:04:15 +0000 |
| commit | e00452a74e42b5aeb121cd1eca15fa386e8ce7f7 (patch) | |
| tree | 2bc63234ed4d1fcc9c9cd4ea3720579a7bb04c63 /src/ui/tools/tool-base.cpp | |
| parent | Improved spray tool, changed selection to object set (diff) | |
| parent | Fixed null when selection contains more than one item (diff) | |
| download | inkscape-e00452a74e42b5aeb121cd1eca15fa386e8ce7f7.tar.gz inkscape-e00452a74e42b5aeb121cd1eca15fa386e8ce7f7.zip | |
Merged trunk
(bzr r14954.1.26)
Diffstat (limited to 'src/ui/tools/tool-base.cpp')
| -rw-r--r-- | src/ui/tools/tool-base.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp index aa355f584..12f52ede3 100644 --- a/src/ui/tools/tool-base.cpp +++ b/src/ui/tools/tool-base.cpp @@ -1081,9 +1081,8 @@ void sp_event_root_menu_popup(SPDesktop *desktop, SPItem *item, GdkEvent *event) item = sp_event_context_find_item (desktop, Geom::Point(event->button.x, event->button.y), FALSE, FALSE); - /* fixme: This is not what I want but works for now (Lauris) */ - if (event->type == GDK_KEY_PRESS) { - item = desktop->getSelection()->singleItem(); + if (event->type == GDK_KEY_PRESS && !desktop->getSelection()->isEmpty()) { + item = desktop->getSelection()->items().front(); } ContextMenu* CM = new ContextMenu(desktop, item); |