diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2015-12-01 21:33:54 +0100 |
|---|---|---|
| committer | Daniel Schürmann <daschuer@mixxx.org> | 2015-12-01 21:33:54 +0100 |
| commit | 04bfe832bf55077dc966549f14b62422b72d59b5 (patch) | |
| tree | b47ed4d7b9e9fa06332a91596d99adf8e64df204 /src/widget/wpushbutton.cpp | |
| parent | c328ed42d66d2e4f96df4ad66a2259d5dd6322e9 (diff) | |
Enable Trigger button on right click, fixes Bug #1521594
Diffstat (limited to 'src/widget/wpushbutton.cpp')
| -rw-r--r-- | src/widget/wpushbutton.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp index b18d912a43..7c2ce82032 100644 --- a/src/widget/wpushbutton.cpp +++ b/src/widget/wpushbutton.cpp @@ -139,11 +139,13 @@ void WPushButton::setup(QDomNode node, const SkinContext& context) { ControlParameterWidgetConnection::EMIT_DEFAULT) { switch (m_leftButtonMode) { case ControlPushButton::PUSH: - case ControlPushButton::LONGPRESSLATCHING: case ControlPushButton::POWERWINDOW: + case ControlPushButton::LONGPRESSLATCHING: leftConnection->setEmitOption( ControlParameterWidgetConnection::EMIT_ON_PRESS_AND_RELEASE); break; + case ControlPushButton::TOGGLE: + case ControlPushButton::TRIGGER: default: leftConnection->setEmitOption( ControlParameterWidgetConnection::EMIT_ON_PRESS); @@ -186,11 +188,13 @@ void WPushButton::setup(QDomNode node, const SkinContext& context) { ControlParameterWidgetConnection::EMIT_DEFAULT) { switch (m_rightButtonMode) { case ControlPushButton::PUSH: - case ControlPushButton::LONGPRESSLATCHING: case ControlPushButton::POWERWINDOW: + case ControlPushButton::LONGPRESSLATCHING: rightConnection->setEmitOption( ControlParameterWidgetConnection::EMIT_ON_PRESS_AND_RELEASE); break; + case ControlPushButton::TOGGLE: + case ControlPushButton::TRIGGER: default: rightConnection->setEmitOption( ControlParameterWidgetConnection::EMIT_ON_PRESS); @@ -338,10 +342,11 @@ void WPushButton::mousePressEvent(QMouseEvent * e) { } if (rightClick) { - // This is the secondary button function allways a Pushbutton + // This is the secondary button function always a Pushbutton // due the leak of visual feedback we do not allow a toggle function - if (m_rightButtonMode == ControlPushButton::PUSH - || m_iNoStates == 1) { + if (m_rightButtonMode == ControlPushButton::PUSH || + m_rightButtonMode == ControlPushButton::TRIGGER || + m_iNoStates == 1) { m_bPressed = true; setControlParameterRightDown(1.0); restyleAndRepaint(); |