some more fiddling; doesn't really accomplish anything but doesn't hurt either. at least now i know why it "jitters" at times. going to be annoying to fix ...
svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=879374
This commit is contained in:
parent
80874e9ad7
commit
e603f32c33
@ -135,8 +135,14 @@ void ToolTip::checkSize()
|
|||||||
resize(hint);
|
resize(hint);
|
||||||
#endif
|
#endif
|
||||||
*/
|
*/
|
||||||
move(x(), y() + (current.height() - hint.height()));
|
/*
|
||||||
|
kDebug() << "resizing from" << current << "to" << hint
|
||||||
|
<< "and moving from" << pos() << "to"
|
||||||
|
<< x() << y() + (current.height() - hint.height())
|
||||||
|
<< current.height() - hint.height();
|
||||||
|
*/
|
||||||
resize(hint);
|
resize(hint);
|
||||||
|
move(x(), y() + (current.height() - hint.height()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -150,6 +156,7 @@ void ToolTip::setContent(const ToolTipContent &data)
|
|||||||
|
|
||||||
if (isVisible()) {
|
if (isVisible()) {
|
||||||
d->preview->setInfo();
|
d->preview->setInfo();
|
||||||
|
//kDebug() << "about to check size";
|
||||||
checkSize();
|
checkSize();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -169,6 +176,7 @@ void ToolTip::prepareShowing(bool cueUpdate)
|
|||||||
|
|
||||||
layout()->activate();
|
layout()->activate();
|
||||||
d->preview->setInfo();
|
d->preview->setInfo();
|
||||||
|
//kDebug() << "about to check size";
|
||||||
checkSize();
|
checkSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -180,7 +188,7 @@ void ToolTip::moveTo(const QPoint &to)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
d->from = pos();
|
d->from = QPoint();
|
||||||
d->to = to;
|
d->to = to;
|
||||||
|
|
||||||
if (!d->timeline) {
|
if (!d->timeline) {
|
||||||
@ -196,6 +204,10 @@ void ToolTip::moveTo(const QPoint &to)
|
|||||||
|
|
||||||
void ToolTip::animateMove(qreal progress)
|
void ToolTip::animateMove(qreal progress)
|
||||||
{
|
{
|
||||||
|
if (d->from.isNull()) {
|
||||||
|
d->from = pos();
|
||||||
|
}
|
||||||
|
|
||||||
if (qFuzzyCompare(progress, 1.0)) {
|
if (qFuzzyCompare(progress, 1.0)) {
|
||||||
move(d->to);
|
move(d->to);
|
||||||
return;
|
return;
|
||||||
@ -209,7 +221,6 @@ void ToolTip::resizeEvent(QResizeEvent *e)
|
|||||||
{
|
{
|
||||||
QWidget::resizeEvent(e);
|
QWidget::resizeEvent(e);
|
||||||
d->background->resizeFrame(size());
|
d->background->resizeFrame(size());
|
||||||
|
|
||||||
setMask(d->background->mask());
|
setMask(d->background->mask());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user