feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tooltip: Hide when Escape is pressed

Browse Source 
Change-Id: Ib516cbbd9b51ddac3dac48668e3341830233af4b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Orgad Shaneh
2017-09-08 16:15:02 +03:00
committed by Orgad Shaneh
parent ac2012a73a
commit 50e3085f22
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/tooltip/tooltip.cpp
View File

@@ -305,9 +305,11 @@ bool ToolTip::eventFilter(QObject *o, QEvent *event)
switch (event->type()) { switch (event->type()) {
case QEvent::KeyPress: case QEvent::KeyPress:
case QEvent::KeyRelease: case QEvent::KeyRelease: {
if (HostOsInfo::isMacHost()) {
int key = static_cast<QKeyEvent *>(event)->key(); int key = static_cast<QKeyEvent *>(event)->key();
if (key == Qt::Key_Escape)
hideTipImmediately();
if (HostOsInfo::isMacHost()) {
Qt::KeyboardModifiers mody = static_cast<QKeyEvent *>(event)->modifiers(); Qt::KeyboardModifiers mody = static_cast<QKeyEvent *>(event)->modifiers();
if (!(mody & Qt::KeyboardModifierMask) if (!(mody & Qt::KeyboardModifierMask)
&& key != Qt::Key_Shift && key != Qt::Key_Control && key != Qt::Key_Shift && key != Qt::Key_Control
@@ -315,6 +317,7 @@ bool ToolTip::eventFilter(QObject *o, QEvent *event)
hideTipWithDelay(); hideTipWithDelay();
} }
break; break;
}
case QEvent::Leave: case QEvent::Leave:
if (o == m_tip && !m_tip->isAncestorOf(QApplication::focusWidget())) if (o == m_tip && !m_tip->isAncestorOf(QApplication::focusWidget()))
hideTipWithDelay(); hideTipWithDelay();