[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib
From:       Bastian Holst <bastianholst () gmx ! de>
Date:       2010-04-30 20:40:40
Message-ID: 20100430204040.A0FD6AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1121219 by bholst:

Upon mouse move, iterating the float items (to see whether the input handler needs to \
process it or not) is not necessary. Therefore, let's do a quick culling before we \
enter the loop. Same for visible selection rubber. Patch by Ariya Hidayat

 M  +5 -3      MarbleWidgetInputHandler.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidgetInputHandler.cpp #1121218:1121219
@@ -448,16 +448,18 @@
         // Do not handle (and therefore eat) mouse press and release events
         // that occur above visible float items. Mouse motion events are still
         // handled, however.
+        if ( e->type() != QEvent::MouseMove
+             && !d->m_selectionRubber->isVisible() )
+        {
         foreach ( AbstractFloatItem *floatItem, \
MarbleWidgetInputHandler::d->m_widget->floatItems() ) {  if ( floatItem->enabled() && \
                floatItem->visible()
-                 && floatItem->contains( event->pos() )
-                 && e->type() != QEvent::MouseMove
-                 && !d->m_selectionRubber->isVisible())
+                     && floatItem->contains( event->pos() ) )
             {
                 d->m_lmbTimer.stop();                
                 return false;
             }
         }
+        }
 
         // emit the position string only if the signal got attached
         if ( MarbleWidgetInputHandler::d->m_positionSignalConnected ) {


[prev in list] [next in list] [prev in thread] [next in thread]