Fix last commit.
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=756632
This commit is contained in:
parent
ee428ee92c
commit
1ce57b1d7b
@ -110,6 +110,12 @@ void ToolTip::slotShowToolTip()
|
|||||||
return;
|
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
|
d->isShown = true; //ToolTip is visible
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
}
|
}
|
||||||
@ -124,11 +130,7 @@ void ToolTip::slotResetTimer()
|
|||||||
void ToolTip::showEvent( QShowEvent* e )
|
void ToolTip::showEvent( QShowEvent* e )
|
||||||
{
|
{
|
||||||
QWidget::showEvent( e );
|
QWidget::showEvent( e );
|
||||||
if( d->windowToPreview != 0 ) { //show or hide the window preview area
|
d->preview->setInfo();
|
||||||
d->preview->show();
|
|
||||||
d->preview->setInfo();
|
|
||||||
} else
|
|
||||||
d->preview->hide();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolTip::ToolTip()
|
ToolTip::ToolTip()
|
||||||
@ -161,7 +163,8 @@ void ToolTip::setData(const Plasma::ToolTipData &data)
|
|||||||
d->label->setText("<qt><h3>" + data.mainText + "</h3><p>" +
|
d->label->setText("<qt><h3>" + data.mainText + "</h3><p>" +
|
||||||
data.subText + "</p></qt>");
|
data.subText + "</p></qt>");
|
||||||
d->imageLabel->setPixmap(data.image);
|
d->imageLabel->setPixmap(data.image);
|
||||||
d->preview->setWindowId( data.windowToPreview );
|
d->windowToPreview = data.windowToPreview;
|
||||||
|
d->preview->setWindowId( d->windowToPreview );
|
||||||
}
|
}
|
||||||
|
|
||||||
ToolTip::~ToolTip()
|
ToolTip::~ToolTip()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user