alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

slightly more deterministic tooltip animations

Browse Source
This commit is contained in:
Marco Martin 2014-04-25 22:43:39 +02:00
parent fcbb057dca
commit 65c5c0dfe8
4 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/declarativeimports/core/tooltip.cpp
View File

@ -169,7 +169,6 @@ void ToolTip::showToolTip()
}
}
dlg->setDirection(dir);
dlg->setLocation(location);
dlg->setMainItem(mainItem());
dlg->setVisualParent(this);

18
src/declarativeimports/core/tooltipdialog.cpp
View File

@ -33,12 +33,10 @@ ToolTipDialog::ToolTipDialog(QQuickItem *parent)
m_qmlObject(0),
m_animation(0),
m_hideTimeout(4000),
m_direction(Plasma::Types::Up),
m_interactive(false)
{
setFlags(Qt::ToolTip);
setLocation(Plasma::Types::Floating);
setDirection(Plasma::Types::Up);
m_animation = new QPropertyAnimation(this);
connect(m_animation, SIGNAL(valueChanged(QVariant)),
@ -77,16 +75,6 @@ QQuickItem *ToolTipDialog::loadDefaultItem()
return qobject_cast<QQuickItem *>(m_qmlObject->rootObject());
}
Plasma::Types::Direction ToolTipDialog::direction() const
{
return m_direction;
}
void ToolTipDialog::setDirection(Plasma::Types::Direction dir)
{
m_direction = dir;
}
void ToolTipDialog::showEvent(QShowEvent *event)
{
m_showTimer->start(m_hideTimeout);
@ -127,11 +115,11 @@ bool ToolTipDialog::event(QEvent *e)
void ToolTipDialog::adjustGeometry(const QRect &geom)
{
if (isVisible()) {
switch (m_direction) {
case Plasma::Types::Left:
switch (location()) {
case Plasma::Types::RightEdge:
setX(x() + (size().width() - geom.size().width()));
break;
case Plasma::Types::Up:
case Plasma::Types::BottomEdge:
setY(y() + (size().height() - geom.size().height()));
break;
default:

1
src/declarativeimports/core/tooltipdialog.h
View File

@ -79,7 +79,6 @@ private:
QTimer *m_showTimer;
QPropertyAnimation *m_animation;
int m_hideTimeout;
Plasma::Types::Direction m_direction;
bool m_interactive;
};

12
src/plasmaquick/dialog.cpp
View File

@ -239,10 +239,15 @@ void DialogPrivate::updateVisibility(bool visible)
void DialogPrivate::updateMinimumWidth()
{
if (mainItemLayout) {
int oldWidth = q->width();
q->setMinimumWidth(mainItemLayout.data()->property("minimumWidth").toInt() + frameSvgItem->margins()->left() + frameSvgItem->margins()->right());
//Sometimes setMinimumWidth doesn't actually resize: Qt bug?
resizeOrigin = DialogPrivate::Window;
q->setWidth(qMax(q->width(), q->minimumWidth()));
if (location == Plasma::Types::RightEdge) {
q->setX(q->x() + (oldWidth - q->size().width()));
}
} else {
q->setMinimumWidth(-1);
}
@ -251,10 +256,15 @@ void DialogPrivate::updateMinimumWidth()
void DialogPrivate::updateMinimumHeight()
{
if (mainItemLayout) {
int oldHeight = q->height();
q->setMinimumHeight(mainItemLayout.data()->property("minimumHeight").toInt() + frameSvgItem->margins()->top() + frameSvgItem->margins()->bottom());
//Sometimes setMinimumHeight doesn't actually resize: Qt bug?
resizeOrigin = DialogPrivate::Window;
q->setHeight(qMax(q->height(), q->minimumHeight()));
if (location == Plasma::Types::BottomEdge) {
q->setY(q->y() + (oldHeight - q->size().height()));
}
} else {
q->setMinimumHeight(-1);
}
@ -548,7 +558,7 @@ void Dialog::setVisualParent(QQuickItem *visualParent)
setTransientParent(visualParent->window());
}
d->resizeOrigin = DialogPrivate::MainItem;
d->requestSizeSync();
d->requestSizeSync(true);
}
}