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

List:       kde-commits
Subject:    kdereview/plasma/applets/trash
From:       Marco Martin <notmart () gmail ! com>
Date:       2008-02-21 10:29:46
Message-ID: 1203589786.897340.32292.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 777707 by mart:

use the new function watchForMouseMove instead of own implementation

 M  +1 -45     trash.cpp  
 M  +0 -2      trash.h  


--- trunk/kdereview/plasma/applets/trash/trash.cpp #777706:777707
@@ -89,7 +89,7 @@
     m_dirLister->openUrl(m_trashUrl);
     setDrawStandardBackground(false);
     m_icon->setDrawBackground(true);
-    m_icon->installSceneEventFilter(this);
+    watchForMouseMove(m_icon, true);
 
     m_data.mainText = i18n("Trash");
 }
@@ -236,50 +236,6 @@
     return actions;
 }
 
-bool Trash::sceneEventFilter( QGraphicsItem * watched, QEvent * event )
-{
-    switch (event->type())
-    {
-        case QEvent::GraphicsSceneMouseMove:
-        {
-            mouseMoveEvent(dynamic_cast<QGraphicsSceneMouseEvent*>(event));
-            break;
-        }
-
-        default:
-            break;
-    }
-
-    return QGraphicsItem::sceneEventFilter(watched, event);
-}
-
-void Trash::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
-    if (!isImmutable() && formFactor() == Plasma::Planar) {
-        QGraphicsItem *parent = parentItem();
-        Plasma::Applet *applet = qgraphicsitem_cast<Plasma::Applet*>(parent);
-
-        if (applet && applet->isContainment()) {
-            // our direct parent is a containment. just move ourselves.
-            QPointF curPos = event->pos();
-            QPointF lastPos = event->lastPos();
-            QPointF delta = curPos-lastPos;
-
-            moveBy(delta.x(),delta.y());
-        } else if (parent) {
-            //don't move the icon as well because our parent (usually an appletHandle) will do it for us
-            QPointF curPos = parent->transform().map(event->pos());
-            QPointF lastPos = parent->transform().map(event->lastPos());
-            QPointF delta = curPos-lastPos;
-
-            parent->setPos(parent->pos() + delta);
-        }
-
-        // We don't want any events on mouse release
-        m_icon->setUnpressed();
-    }
-}
-
 void Trash::dropEvent(QGraphicsSceneDragDropEvent *event)
 {
     if (KUrl::List::canDecode(event->mimeData())) {
--- trunk/kdereview/plasma/applets/trash/trash.h #777706:777707
@@ -56,8 +56,6 @@
         void slotEmpty();
 
     protected:
-        bool sceneEventFilter(QGraphicsItem * watched, QEvent * event);
-        void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
         void dropEvent(QGraphicsSceneDragDropEvent *event);
         void createMenu();
         void setIcon();
[prev in list] [next in list] [prev in thread] [next in thread]