diff options
| author | chr <chr> | 2017-05-23 19:48:22 +0000 |
|---|---|---|
| committer | chr <chr> | 2017-05-23 19:48:22 +0000 |
| commit | dc80e5d0bf82f005628881134b929aa4838308d5 (patch) | |
| tree | 0cbe1a5aaf0673816abe5ac2674a7fc3f327b87b /src/ui/dialog/objects.cpp | |
| parent | object panel: don't scroll to layer when leaving object group (diff) | |
| download | inkscape-dc80e5d0bf82f005628881134b929aa4838308d5.tar.gz inkscape-dc80e5d0bf82f005628881134b929aa4838308d5.zip | |
selection chemistry: implement z-stack order
Bug #1395452
"raise and lower objects" used to stack objects above/below the next overlapping object,
which makes it impossible to change the z-order of objects that don't overlap.
Fixes also the object manager panel
Conflicts:
src/selection-chemistry.cpp
src/selection-chemistry.h
src/sp-item.cpp
(bzr r15698.1.7)
Diffstat (limited to 'src/ui/dialog/objects.cpp')
| -rw-r--r-- | src/ui/dialog/objects.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index c624a8435..55a944afb 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -722,14 +722,14 @@ bool ObjectsPanel::_handleKeyEvent(GdkEventKey *event) case GDK_KEY_Page_Up: { //Move item(s) up in containing group/layer - int ch = event->state & GDK_SHIFT_MASK ? SP_VERB_LAYER_MOVE_TO_NEXT : SP_VERB_SELECTION_RAISE; + int ch = event->state & GDK_SHIFT_MASK ? SP_VERB_LAYER_MOVE_TO_NEXT : SP_VERB_SELECTION_STACK_UP; _fireAction( empty ? SP_VERB_LAYER_RAISE : ch ); break; } case GDK_KEY_Page_Down: { //Move item(s) down in containing group/layer - int ch = event->state & GDK_SHIFT_MASK ? SP_VERB_LAYER_MOVE_TO_PREV : SP_VERB_SELECTION_LOWER; + int ch = event->state & GDK_SHIFT_MASK ? SP_VERB_LAYER_MOVE_TO_PREV : SP_VERB_SELECTION_STACK_DOWN; _fireAction( empty ? SP_VERB_LAYER_LOWER : ch ); break; } @@ -1182,7 +1182,7 @@ bool ObjectsPanel::_executeAction() } else { - _fireAction( SP_VERB_SELECTION_RAISE ); + _fireAction( SP_VERB_SELECTION_STACK_UP ); } } break; @@ -1194,7 +1194,7 @@ bool ObjectsPanel::_executeAction() } else { - _fireAction( SP_VERB_SELECTION_LOWER ); + _fireAction( SP_VERB_SELECTION_STACK_DOWN ); } } break; @@ -1903,8 +1903,8 @@ ObjectsPanel::ObjectsPanel() : _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem())); - _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_RAISE, "gtk-go-up", _("Up"), (int)BUTTON_UP ) ); - _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_LOWER, "gtk-go-down", _("Down"), (int)BUTTON_DOWN ) ); + _watchingNonTop.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_STACK_UP, "gtk-go-up", _("Up"), (int)BUTTON_UP ) ); + _watchingNonBottom.push_back( &_addPopupItem( targetDesktop, SP_VERB_SELECTION_STACK_DOWN, "gtk-go-down", _("Down"), (int)BUTTON_DOWN ) ); _popupMenu.append(*Gtk::manage(new Gtk::SeparatorMenuItem())); |