[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Accept a mouse move event even if we have the ALT, CTRL, or SHIFT key pressed. This prevents some odd focus issues.


  M +14 -12    ksttoplevelview.cpp   1.37
  M +1 -1      kstviewwidget.cpp   1.18


--- kdeextragear-2/kst/kst/ksttoplevelview.cpp  #1.36:1.37
@@ -244,4 +244,5 @@ bool KstTopLevelView::handlePress(const 
   _pressTarget = findChild(pos);
   assert(_pressTarget);
+  if(_pressTarget) {
   _pressDirection = directionFor(pos, _pressTarget->geometry());
   if (_pressDirection == 0) {
@@ -260,4 +261,5 @@ bool KstTopLevelView::handlePress(const 
 
   _pressTarget->setFocus(false);
+  }
 
   return true;

--- kdeextragear-2/kst/kst/kstviewwidget.cpp  #1.17:1.18
@@ -89,5 +89,5 @@ void KstViewWidget::leaveEvent(QEvent *e
 
 void KstViewWidget::mouseMoveEvent(QMouseEvent *e) {
-  if (e->state() == 0) {
+  if ((e->state() & Qt::MouseButtonMask) == 0) {
     _view->updateFocus(e->pos());
     e->accept();