From 1ce57b1d7b082523b91487cfb0802887b7d54482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Thu, 3 Jan 2008 13:59:03 +0000
Subject: [PATCH] Fix last commit.

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=756632
---
 widgets/tooltip.cpp | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/widgets/tooltip.cpp b/widgets/tooltip.cpp
index f800e47bc..f7f9acd86 100644
--- a/widgets/tooltip.cpp
+++ b/widgets/tooltip.cpp
@@ -110,6 +110,12 @@ void ToolTip::slotShowToolTip()
 	return;
     }
 
+    if( d->windowToPreview != 0 ) // show/hide the preview area
+        d->preview->show();
+    else
+        d->preview->hide();
+    layout()->activate();
+
     d->isShown = true;  //ToolTip is visible
     setVisible(true);
 }
@@ -124,11 +130,7 @@ void ToolTip::slotResetTimer()
 void ToolTip::showEvent( QShowEvent* e )
 {
     QWidget::showEvent( e );
-    if( d->windowToPreview != 0 ) { //show or hide the window preview area
-        d->preview->show();
-        d->preview->setInfo();
-    } else
-        d->preview->hide();
+    d->preview->setInfo();
 }
 
 ToolTip::ToolTip()
@@ -161,7 +163,8 @@ void ToolTip::setData(const Plasma::ToolTipData &data)
     d->label->setText("<qt><h3>" + data.mainText + "</h3><p>" +
                         data.subText + "</p></qt>");
     d->imageLabel->setPixmap(data.image);
-    d->preview->setWindowId( data.windowToPreview );
+    d->windowToPreview = data.windowToPreview;
+    d->preview->setWindowId( d->windowToPreview );
 }
 
 ToolTip::~ToolTip()