diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2006-06-05 08:10:41 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2006-06-05 08:10:41 +0000 |
| commit | 1260ee8e96ed6e9a7eea8415a8592780927dca6b (patch) | |
| tree | 1830cd7ecdd33225f5c4359c5a60cb37ef88b7f5 | |
| parent | Applied patch 1500659 for warning cleanup (diff) | |
| download | inkscape-1260ee8e96ed6e9a7eea8415a8592780927dca6b.tar.gz inkscape-1260ee8e96ed6e9a7eea8415a8592780927dca6b.zip | |
Allow "new layer" action when no layer selected
(bzr r1159)
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/dialogs/layers-panel.cpp | 10 |
2 files changed, 15 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2006-06-02 Jon A. Cruz <jon@joncruz.org> + * src/dialogs/layers-panel.cpp: + + Allow action when no layer selected. + Fixes bugs #1494646. + +2006-06-02 Jon A. Cruz <jon@joncruz.org> + * trace/siox.cpp: Applied patch #1500659. @@ -9,7 +16,7 @@ * src/dialogs/layers-panel.h, src/dialogs/layers-panel.cpp: Blocked signal when changes are not from the layers UI. - Fixes bug #1495406. + Fixes bugs #1495406 and most of #1494646. 2006-06-02 Colin Marquardt <colin@marquardt-home.de> diff --git a/src/dialogs/layers-panel.cpp b/src/dialogs/layers-panel.cpp index 82def825c..e89e5050d 100644 --- a/src/dialogs/layers-panel.cpp +++ b/src/dialogs/layers-panel.cpp @@ -314,9 +314,13 @@ bool LayersPanel::_executeAction() { // Make sure selected layer hasn't changed since the action was triggered if ( _pending - && !( (_desktop && _desktop->currentLayer()) - && (_desktop->currentLayer() != _pending->_target) - ) ) { + && ( + (_pending->_actionCode == BUTTON_NEW) + || !( (_desktop && _desktop->currentLayer()) + && (_desktop->currentLayer() != _pending->_target) + ) + ) + ) { int val = _pending->_actionCode; // SPObject* target = _pending->_target; |