[Kst] extragear/graphics/kst/src/libkstapp

[Andrew Walker]

SVN commit 552204 by arwalker:

BUG:129270 Ensure no phantom guidelines are created when switching modes.

 M  +4 -2      kst2dplot.cpp  
 M  +1 -1      ksttoplevelview.cpp  


--- trunk/extragear/graphics/kst/src/libkstapp/kst2dplot.cpp #552203:552204
@@ -2383,8 +2383,10 @@
 
     KstMouseModeType gzType = globalZoomType();
     if (view && (gzType == X_ZOOMBOX || gzType == Y_ZOOMBOX)) {
-      updateXYGuideline(view, QPoint(-1, -1), view->mapFromGlobal(QCursor::pos()), GetPlotRegion(), gzType);
-      _mouse.lastGuideline = view->mapFromGlobal(QCursor::pos());
+      if (GetPlotRegion().contains(_mouse.tracker)) {
+        updateXYGuideline(view, QPoint(-1, -1), view->mapFromGlobal(QCursor::pos()), GetPlotRegion(), gzType);
+        _mouse.lastGuideline = view->mapFromGlobal(QCursor::pos());
+      }
     }
   }
 }
--- trunk/extragear/graphics/kst/src/libkstapp/ksttoplevelview.cpp #552203:552204
@@ -240,10 +240,10 @@
   if (_mode == LayoutMode && v != LayoutMode) {
     recursively<bool>(&KstViewObject::setSelected, false);
     clearFocus();
-    paint(KstPainter::P_PAINT);
   } else if (_mode == DisplayMode && v != DisplayMode) {
     recursively<bool>(&KstViewObject::setMaximized, false);
   }
+  paint(KstPainter::P_PAINT);
 
   _mode = v;