[Kst] kdeextragear-2/kst

[George Staikos]

CVS commit by staikos: 

fix shift+click drawing the focus rect if the mouse moves


  M +0 -1      devel-docs/RELEASE_PLAN   1.15
  M +5 -1      kst/ksttoplevelview.cpp   1.65
  M +1 -1      kst/ksttoplevelview.h   1.38
  M +1 -1      kst/kstviewwidget.cpp   1.51


--- kdeextragear-2/kst/devel-docs/RELEASE_PLAN  #1.14:1.15
@@ -57,5 +57,4 @@
 Bugs:
 - Histograms don't export vectors
-- focus rect is drawn when shift+click is done in layout mode (George)
 - in realtime mode, statusbar coordinates don't update properly if the mouse
   isn't moved

--- kdeextragear-2/kst/kst/ksttoplevelview.cpp  #1.64:1.65
@@ -437,5 +437,5 @@ static void slideInto(const QRect& regio
 
 // Optimize me: can store, for instance, the painter I think
-void KstTopLevelView::pressMove(const QPoint& pos) {
+void KstTopLevelView::pressMove(const QPoint& pos, bool shift) {
   if (_mode != LayoutMode) {
     _pressTarget = 0L;
@@ -447,4 +447,8 @@ void KstTopLevelView::pressMove(const QP
   }
 
+  if (shift && _moveOffset == QPoint(-1, -1)) {
+    return;
+  }
+
   if (_pressTarget) {
     if (_pressDirection == 0) {

--- kdeextragear-2/kst/kst/ksttoplevelview.h  #1.37:1.38
@@ -89,5 +89,5 @@ class KstTopLevelView : public KstViewOb
     void updateFocus(const QPoint& pos);
     bool handlePress(const QPoint& pos, bool shift = false);
-    void pressMove(const QPoint& pos);
+    void pressMove(const QPoint& pos, bool shift = false);
     void releasePress(const QPoint& pos, bool shift = false);
     void setCursorFor(const QPoint& pos, const QRect& objGeom);

--- kdeextragear-2/kst/kst/kstviewwidget.cpp  #1.50:1.51
@@ -147,5 +147,5 @@ void KstViewWidget::mouseMoveEvent(QMous
     e->accept();
   } else if (e->state() & Qt::LeftButton) {
-    _view->pressMove(e->pos());
+    _view->pressMove(e->pos(), e->state() & Qt::ShiftButton);
     e->accept();
   }