summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-25 18:37:54 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-25 18:37:54 +0000
commitd6bcc187d2f408e3e27598dd7f03821647e51c2e (patch)
tree7e5039a28026c3b682c21ff697cc18ec8c960639 /kicker
parent648e1d840818ee963970f6d69e6aa59fc2651d1f (diff)
downloadtdebase-d6bcc187d2f408e3e27598dd7f03821647e51c2e.tar.gz
tdebase-d6bcc187d2f408e3e27598dd7f03821647e51c2e.zip
Fix taskbar when parent application is using ARGB windows
Fix composition configuration default settings Add logout notice to give the user feedback that yes, the logout command actually WAS accepted git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1249522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker')
-rw-r--r--kicker/taskbar/taskcontainer.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 5b084a962..dee5c12e5 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -57,6 +57,10 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar,
TQWidget *parent, const char *name)
: TQToolButton(parent, name),
+ animationTimer(0, "TaskContainer::animationTimer"),
+ dragSwitchTimer(0, "TaskContainer::dragSwitchTimer"),
+ attentionTimer(0, "TaskContainer::attentionTimer"),
+ m_paintEventCompressionTimer(0, "TaskContainer::paintEventCompressionTimer"),
currentFrame(0),
attentionState(-1),
lastActivated(0),
@@ -66,12 +70,7 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar,
taskBar(bar),
discardNextMouseEvent(false),
aboutToActivate(false),
- m_mouseOver(false),
- animationTimer(0, "TaskContainer::animationTimer"),
- dragSwitchTimer(0, "TaskContainer::dragSwitchTimer"),
- attentionTimer(0, "TaskContainer::attentionTimer"),
- m_paintEventCompression(false),
- m_paintEventCompressionTimer(0, "TaskContainer::paintEventCompressionTimer")
+ m_paintEventCompression(false)
{
init();
setAcceptDrops(true); // Always enabled to activate task during drag&drop.
@@ -88,6 +87,10 @@ TaskContainer::TaskContainer(Task::Ptr task, TaskBar* bar,
TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames,
TaskBar* bar, TQWidget *parent, const char *name)
: TQToolButton(parent, name),
+ animationTimer(0, "TaskContainer::animationTimer"),
+ dragSwitchTimer(0, "TaskContainer::dragSwitchTimer"),
+ attentionTimer(0, "TaskContainer::attentionTimer"),
+ m_paintEventCompressionTimer(0, "TaskContainer::paintEventCompressionTimer"),
currentFrame(0),
frames(startupFrames),
attentionState(-1),
@@ -99,11 +102,7 @@ TaskContainer::TaskContainer(Startup::Ptr startup, PixmapList& startupFrames,
discardNextMouseEvent(false),
aboutToActivate(false),
m_mouseOver(false),
- animationTimer(0, "TaskContainer::animationTimer"),
- dragSwitchTimer(0, "TaskContainer::dragSwitchTimer"),
- attentionTimer(0, "TaskContainer::attentionTimer"),
- m_paintEventCompression(false),
- m_paintEventCompressionTimer(0, "TaskContainer::paintEventCompressionTimer")
+ m_paintEventCompression(false)
{
init();
setEnabled(false);
@@ -481,7 +480,10 @@ void TaskContainer::paintEvent( TQPaintEvent* )
drawButton(&p);
p.end();
- bitBlt(this, 0, 0, pm);
+ TQPixmap iconPixmapToSet = *pm;
+ if (TQPaintDevice::x11AppDepth() == 32) iconPixmapToSet.convertFromImage(KImageEffect::convertToPremultipliedAlpha( iconPixmapToSet.convertToImage() ));
+
+ bitBlt(this, 0, 0, &iconPixmapToSet);
delete pm;
}