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

Fix ProxyAction if layered 2 times

Browse Source 
Change-Id: Icf17f93deb259bfed85e138311d39300d72ee4b5
Reviewed-on: http://codereview.qt.nokia.com/193
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
dt_
2011-05-27 14:34:48 +02:00
committed by hjk
parent fec98bdf80
commit f88f4918a4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/proxyaction.cpp
View File

@@ -38,7 +38,8 @@ ProxyAction::ProxyAction(QObject *parent) :
QAction(parent), QAction(parent),
m_action(0), m_action(0),
m_attributes(0), m_attributes(0),
m_showShortcut(false) m_showShortcut(false),
m_block(false)
{ {
connect(this, SIGNAL(changed()), this, SLOT(updateToolTipWithKeySequence())); connect(this, SIGNAL(changed()), this, SLOT(updateToolTipWithKeySequence()));
updateState(); updateState();
@@ -161,15 +162,14 @@ void ProxyAction::setShortcutVisibleInToolTip(bool visible)
void ProxyAction::updateToolTipWithKeySequence() void ProxyAction::updateToolTipWithKeySequence()
{ {
static bool block = false; if (m_block)
if (block)
return; return;
block = true; m_block = true;
if (!m_showShortcut || shortcut().isEmpty()) if (!m_showShortcut || shortcut().isEmpty())
setToolTip(m_toolTip); setToolTip(m_toolTip);
else else
setToolTip(stringWithAppendedShortcut(m_toolTip, shortcut())); setToolTip(stringWithAppendedShortcut(m_toolTip, shortcut()));
block = false; m_block = false;
} }
QString ProxyAction::stringWithAppendedShortcut(const QString &str, const QKeySequence &shortcut) QString ProxyAction::stringWithAppendedShortcut(const QString &str, const QKeySequence &shortcut)

1
src/libs/utils/proxyaction.h
View File

@@ -81,6 +81,7 @@ private:
Attributes m_attributes; Attributes m_attributes;
bool m_showShortcut; bool m_showShortcut;
QString m_toolTip; QString m_toolTip;
bool m_block;
}; };
} // namespace Utils } // namespace Utils