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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-08-29 14:28:56
Message-ID: 1251556136.350424.15823.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1017001 by aseigo:

proper parent check
BUG:193871


 M  +5 -4      abstracttaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/tasks/abstracttaskitem.cpp #1017000:1017001
@@ -290,7 +290,8 @@
 {
     Q_UNUSED(event)
     fadeBackground("hover", 175, true);
-    if (parentGroup()) {
+    QGraphicsWidget *w = parentWidget();
+    if (w && w != m_applet->rootGroupItem()) {
         if (m_hoverEffectTimerId) {
             killTimer(m_hoverEffectTimerId);
         }
@@ -443,7 +444,6 @@
         } else {
             WindowTaskItem *windowTaskItem = qobject_cast<WindowTaskItem *>(this);
             if (windowTaskItem && windowTaskItem->parent()) {
-                TaskGroupItem *groupItem = qobject_cast<TaskGroupItem *>(windowTaskItem->parent());
                 if (groupItem && groupItem->popupDialog()) {
                     windows.append(groupItem->popupDialog()->winId());
                 }
@@ -469,9 +469,10 @@
             data.resize(actualCount);
         }
 
-        if (!data.isEmpty() && m_applet->view()) {
+        QGraphicsView *view = m_applet->view();
+        if (!data.isEmpty() && view) {
             Display *dpy = QX11Info::display();
-            const WId winId = m_applet->view()->winId();
+            const WId winId = view->winId();
             Atom atom = XInternAtom(dpy, "_KDE_WINDOW_HIGHLIGHT", False);
             XChangeProperty(dpy, winId, atom, atom, 32, PropModeReplace,
                             reinterpret_cast<unsigned char *>(data.data()), data.size());
[prev in list] [next in list] [prev in thread] [next in thread]