yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Plasma/5.13'

Browse source
This commit is contained in:
Martin Flöser 2018-06-10 09:20:00 +02:00
commit c86fdf4c54
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
decorations/decoratedclient.cpp
View file

@ -123,11 +123,17 @@ DecoratedClientImpl::DecoratedClientImpl(AbstractClient *client, KDecoration2::D
this->m_toolTipFallAsleep.setRemainingTime(fallAsleepDelay);
QToolTip::showText(Cursor::pos(), this->m_toolTipText);
m_toolTipShowing = true;
}
);
}
DecoratedClientImpl::~DecoratedClientImpl() = default;
DecoratedClientImpl::~DecoratedClientImpl()
{
if (m_toolTipShowing) {
requestHideToolTip();
}
}
void DecoratedClientImpl::signalShadeChange() {
emit decoratedClient()->shadedChanged(m_client->isShade());
@ -224,6 +230,7 @@ void DecoratedClientImpl::requestHideToolTip()
{
m_toolTipWakeUp.stop();
QToolTip::hideText();
m_toolTipShowing = false;
}
void DecoratedClientImpl::requestShowWindowMenu()

1
decorations/decoratedclient.h
View file

@ -115,6 +115,7 @@ private:
QString m_toolTipText;
QTimer m_toolTipWakeUp;
QDeadlineTimer m_toolTipFallAsleep;
bool m_toolTipShowing = false;
};
}