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

List:       kde-commits
Subject:    KDE/kdebase/apps/plasma/applets/folderview
From:       Fredrik Höglund <fredrik () kde ! org>
Date:       2010-05-13 19:38:14
Message-ID: 20100513193814.261B0AC8B5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1126346 by fredrik:

If a containment action is assigned to the left mouse button,
give it precedence over elastic-band selections.

Fixed in: 4.4.4
BUG: 183599


 M  +12 -0     iconview.cpp  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/iconview.cpp \
#1126345:1126346 @@ -59,6 +59,7 @@
 #include "asyncfiletester.h"
 
 #include <Plasma/Containment>
+#include <Plasma/ContainmentActions>
 #include <Plasma/Corona>
 #include <Plasma/PaintUtils>
 #include <Plasma/Theme>
@@ -1822,6 +1823,17 @@
         m_pressedIndex = QModelIndex();
         m_buttonDownPos = pos;
 
+        // If a containment action is assigned to the left mouse button,
+        // give it precedence over rubberband-selections
+        Plasma::Containment *containment = \
qobject_cast<Plasma::Containment*>(parentWidget()); +        if \
(containment && containment->isContainment()) { +            const QString \
trigger = Plasma::ContainmentActions::eventToString(event); +            if \
(!containment->containmentActions(trigger).isEmpty()) { +                \
event->ignore(); +                return;
+            }
+        }
+
         if (event->modifiers() & Qt::ControlModifier) {
             // Make the current selection persistent
             m_selectionModel->select(m_selectionModel->selection(), \
QItemSelectionModel::Select);


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