diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2013-12-08 20:01:13 +0100 |
---|---|---|
committer | Daniel Schürmann <daschuer@mixxx.org> | 2013-12-08 20:30:19 +0100 |
commit | ae51a0e96ca9cec1ef0f508f1cc93274cb95e927 (patch) | |
tree | b5ed71cc0e18ccc1966961352b375fa67cd5b43e | |
parent | ecd5b2085a11639b141064709b1494c0575f9999 (diff) |
revert a remaining unrelated change
-rw-r--r-- | src/widget/wpushbutton.cpp | 17 | ||||
-rw-r--r-- | src/widget/wpushbutton.h | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp index 7157179b10..b85e122f42 100644 --- a/src/widget/wpushbutton.cpp +++ b/src/widget/wpushbutton.cpp @@ -281,12 +281,17 @@ void WPushButton::mouseReleaseEvent(QMouseEvent * e) { if (rightClick) { // This is the secondary clickButton function, it does not change - // m_value due the leak of visual feedback we do not allow a toggle - // function. It is always a pushbutton, so "RightClickIsPushButton" - // is obsolete - m_bPressed = false; - emit(valueChangedRightUp(0.0f)); - update(); + // m_fValue due the leak of visual feedback we do not allow a toggle + // function + if (m_bRightClickForcePush) { + m_bPressed = false; + emit(valueChangedRightUp(0.0f)); + update(); + } else if (m_iNoStates == 1) { + m_bPressed = false; + emit(valueChangedRightUp(0.0f)); + update(); + } return; } diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h index aa54320ef9..e2cef17bfa 100644 --- a/src/widget/wpushbutton.h +++ b/src/widget/wpushbutton.h @@ -76,8 +76,6 @@ class WPushButton : public WWidget ControlPushButton::ButtonMode m_leftButtonMode; ControlPushButton::ButtonMode m_rightButtonMode; QTimer m_clickTimer; - // to distinguish if the Button is painted by the indicator or the main value - bool m_indicatorConnected; }; #endif |