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

List:       kde-commits
Subject:    kdebase/kicker/taskbar
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-04-22 1:00:40
Message-ID: 20050422010040.47EBE651 () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

lower the timeout on showing a startup item in the taskbar to 1/3rd s
startup items are disabled (can't click on them, no button-on-hover, etc)


  M +6 -15     taskcontainer.cpp   1.132


--- kdebase/kicker/taskbar/taskcontainer.cpp  #1.131:1.132
@@ -100,4 +100,5 @@ TaskContainer::TaskContainer(Startup::Pt
 {
     init();
+    setEnabled(false);
     frames = startupFrames;
 
@@ -106,5 +107,5 @@ TaskContainer::TaskContainer(Startup::Pt
     connect(m_startup, SIGNAL(changed()), SLOT(update()));
 
-    dragSwitchTimer.start(500, true);
+    dragSwitchTimer.start(333, true);
 }
 
@@ -328,20 +329,10 @@ void TaskContainer::remove(Task::Ptr tas
 bool TaskContainer::contains(Task::Ptr task)
 {
-    if (!task)
-    {
-        return false;
-    }
-
-    return (tasks.find(task) != tasks.end());
+    return task && (tasks.find(task) != tasks.end());
 }
 
 bool TaskContainer::contains(Startup::Ptr startup)
 {
-    if (!startup)
-    {
-        return false;
-    }
-
-    return (m_startup == startup);
+    return startup && (m_startup == startup);
 }
 
@@ -463,5 +454,5 @@ void TaskContainer::drawButton(QPainter 
     font.setBold(active);
 
-    QColorGroup colors = colorGroup();
+    QColorGroup colors = palette().active();
     if (demands_attention &&
         (attentionState == ATTENTION_BLINK_TIMEOUT ||
@@ -498,5 +489,5 @@ void TaskContainer::drawButton(QPainter 
     // draw button background
     if (TaskBarSettings::drawButtons() ||
-        (m_mouseOver && TaskBarSettings::showButtonOnHover()))
+        (m_mouseOver && isEnabled() && TaskBarSettings::showButtonOnHover()))
     {
         style().drawPrimitive(QStyle::PE_HeaderSection, p,


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