[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Mike Fenton]

SVN commit 918289 by fenton:

Fix context menu for SharedAxisBoxItem's.


 M  +3 -3      viewitem.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.cpp #918288:918289
@@ -805,7 +805,7 @@
   menu.addAction(_editAction);
 
   QMenu layoutMenu;
-  if (!lockParent()) {
+  if (!(lockParent() || (parentViewItem() && parentViewItem()->lockParent()))) {
     menu.addAction(_raiseAction);
     menu.addAction(_lowerAction);
 
@@ -813,9 +813,10 @@
     layoutMenu.addAction(_autoLayoutAction);
     layoutMenu.addAction(_customLayoutAction);
     menu.addMenu(&layoutMenu);
+
+    menu.addAction(_deleteAction);
   }
 
-  menu.addAction(_deleteAction);
 
   addToMenuForContextEvent(menu);
 
@@ -976,7 +977,6 @@
 
 void ViewItem::resizeBottomRight(const QPointF &offset) {
   const qreal oldAspect = rect().width() / rect().height();
-
   QRectF r = rect();
   QPointF o = _lockAspectRatio ? lockOffset(offset, oldAspect, false) : offset;
   r.setBottomRight(r.bottomRight() + o);