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

List:       kde-commits
Subject:    kdebase/kicker
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-02-24 5:52:53
Message-ID: 20050224055253.A08A1EDBC () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

hide the mouse over effect when a drag is started
improve the OO nature of the drag triggering


  M +0 -5      buttons/browserbutton.cpp   1.20
  M +1 -4      buttons/servicebutton.cpp   1.35
  M +0 -5      buttons/servicemenubutton.cpp   1.13
  M +0 -11     buttons/urlbutton.cpp   1.24
  M +18 -5     share/panelbutton.cpp   1.31
  M +2 -1      share/panelbutton.h   1.20


--- kdebase/kicker/buttons/browserbutton.cpp  #1.19:1.20
@@ -142,9 +142,4 @@ void BrowserButton::properties()
 void BrowserButton::startDrag()
 {
-    if (popup())
-    {
-        popup()->hide();
-    }
-
     KURL url(topMenu->path());
     emit dragme(KURL::List(url), labelIcon());

--- kdebase/kicker/buttons/servicebutton.cpp  #1.34:1.35
@@ -181,6 +181,4 @@ void ServiceButton::dropEvent( QDropEven
 void ServiceButton::startDrag()
 {
-    setDown(false);
-
     QString path = _service->desktopEntryPath();
 
@@ -191,6 +189,5 @@ void ServiceButton::startDrag()
     KURL url;
     url.setPath(path);
-
-    emit dragme(KURL::List(url), labelIcon()); //_service->pixmap(KIcon::Small));
+    emit dragme(KURL::List(url), labelIcon());
 }
 

--- kdebase/kicker/buttons/servicemenubutton.cpp  #1.12:1.13
@@ -83,9 +83,4 @@ void ServiceMenuButton::initPopup()
 void ServiceMenuButton::startDrag()
 {
-    if (popup())
-    {
-        popup()->hide();
-    }
-
     KURL url("programs:/" + topMenu->relPath());
     emit dragme(KURL::List(url), labelIcon());

--- kdebase/kicker/buttons/urlbutton.cpp  #1.23:1.24
@@ -157,15 +157,4 @@ void URLButton::dropEvent(QDropEvent *ev
 void URLButton::startDrag()
 {
-    setDown(false);
-
-/*    KIcon::StdSizes sz = width() < 32 ?
-                             KIcon::SizeSmall :
-                             (width() < 48 ?
-                                KIcon::SizeMedium :
-                                KIcon::SizeLarge);
-
-    QPixmap pm = KGlobal::iconLoader()->loadIcon(fileItem->iconName(),
-                                                 KIcon::Panel, sz,
-                                                 KIcon::DefaultState, 0L, true);*/
     emit dragme(KURL::List(fileItem->url()), labelIcon());
 }

--- kdebase/kicker/share/panelbutton.cpp  #1.30:1.31
@@ -318,7 +318,20 @@ const QPixmap& PanelButton::labelIcon() 
 }
 
-void PanelButton::startDrag()
+void PanelButton::triggerDrag()
 {
     setDown(false);
+
+    if (KickerTip::tippingEnabled())
+    {
+        KickerTip::the()->untipFor(this);
+        kapp->processEvents();
+        kapp->syncX();
+    }
+
+    startDrag();
+}
+
+void PanelButton::startDrag()
+{
     emit dragme(m_icon);
 }
@@ -458,5 +471,5 @@ void PanelButton::mouseMoveEvent(QMouseE
 
     m_isLeftMouseButtonDown = false;
-    startDrag();
+    triggerDrag();
 }
 
@@ -784,5 +797,5 @@ bool PanelPopupButton::eventFilter(QObje
 void PanelPopupButton::slotExecMenu()
 {
-    if (KickerSettings::showMouseOverEffects())
+    if (KickerTip::tippingEnabled())
     {
         KickerTip::the()->untipFor(this);
@@ -803,5 +816,5 @@ void PanelPopupButton::slotExecMenu()
 }
 
-void PanelPopupButton::startDrag()
+void PanelPopupButton::triggerDrag()
 {
     if (m_popup)
@@ -810,5 +823,5 @@ void PanelPopupButton::startDrag()
     }
 
-    PanelButton::startDrag();
+    PanelButton::triggerDrag();
 }
 

--- kdebase/kicker/share/panelbutton.h  #1.19:1.20
@@ -86,4 +86,5 @@ public slots:
 protected:
     virtual QString tileName() = 0;
+    virtual void triggerDrag();
     virtual void startDrag();
     virtual void enterEvent(QEvent *);
@@ -157,5 +158,5 @@ public:
 protected:
     virtual void initPopup() {};
-    virtual void startDrag();
+    virtual void triggerDrag();
 
 protected slots:


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