[Kst] extragear/graphics/kst/kst

[Rick Chern]

SVN commit 449846 by rchern:

Still allow context menu and double-click in temp. layout mode - doing so just exits temp. layout mode (after displaying edit dialog/context menu).  This seems to make sense as having CTRL held down while a dialog is displayed does not make sense. User can still hold down CTRL again to re-enter temp. layout mode.

 M  +5 -7      kstviewwidget.cpp  


--- trunk/extragear/graphics/kst/kst/kstviewwidget.cpp #449845:449846
@@ -246,12 +246,10 @@
   // layout/graphics mode 
   if (e->button() & Qt::LeftButton) {
     // let the toplevel view handle it
-    if (_view->viewMode() == _lastViewMode) {
-      if (_view->handleDoubleClick(e->pos(), e->state() & Qt::ShiftButton)) {
-        e->accept();
-        return;  
-      }  
-    }
+    if (_view->handleDoubleClick(e->pos(), e->state() & Qt::ShiftButton)) {
+      e->accept();
+      return;  
+    }  
   }
 
   //kdDebug() << "   -> Passing up" << endl;
@@ -310,7 +308,7 @@
 
 
 void KstViewWidget::contextMenuEvent(QContextMenuEvent *e) {
-  if (e->state() & Qt::LeftButton || _view->tracking() || _view->viewMode() != _lastViewMode) {
+  if (e->state() & Qt::LeftButton || _view->tracking()) {
     e->ignore();
     return;
   }