summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/fancyactionbar.cpp13
-rw-r--r--src/plugins/coreplugin/fancyactionbar.h5
2 files changed, 2 insertions, 16 deletions
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index 62eecd2331..9ced553afb 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -52,17 +52,10 @@ using namespace Internal;
FancyToolButton::FancyToolButton(QWidget *parent)
: QToolButton(parent), m_fader(0)
{
- m_hasForceVisible = false;
setAttribute(Qt::WA_Hover, true);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
}
-void FancyToolButton::forceVisible(bool visible)
-{
- m_hasForceVisible = true;
- setVisible(visible);
-}
-
bool FancyToolButton::event(QEvent *e)
{
switch (e->type()) {
@@ -302,10 +295,8 @@ void FancyToolButton::actionChanged()
{
// the default action changed in some way, e.g. it might got hidden
// since we inherit a tool button we won't get invisible, so do this here
- if (!m_hasForceVisible) {
- if (QAction* action = defaultAction())
- setVisible(action->isVisible());
- }
+ if (QAction* action = defaultAction())
+ setVisible(action->isVisible());
}
FancyActionBar::FancyActionBar(QWidget *parent)
diff --git a/src/plugins/coreplugin/fancyactionbar.h b/src/plugins/coreplugin/fancyactionbar.h
index dd4722d4ed..a545d4b42b 100644
--- a/src/plugins/coreplugin/fancyactionbar.h
+++ b/src/plugins/coreplugin/fancyactionbar.h
@@ -57,13 +57,8 @@ public:
float fader() { return m_fader; }
void setFader(float value) { m_fader = value; update(); }
- void forceVisible(bool visible);
-
private slots:
void actionChanged();
-
-private:
- bool m_hasForceVisible;
};
class FancyActionBar : public QWidget