Fix touch control #3165

daschuer · 2020-10-08T21:30:40Z

This fixes the broken touch control, reported here:
https://bugs.launchpad.net/mixxx/+bug/1895431

We rely here on our own touch solution for skin buttons. The rest uses the synthesized Qt events.

This was tested with Ubuntu Bionic

…ccording to "touch_shift"

ehendrikd · 2020-10-09T04:32:17Z

I attempted to test this on a Raspberry Pi with a touchscreen, however as it is based on 2.2 it will not compile due to #2504 not being present.

Holzhaus · 2020-10-09T06:29:39Z

@ehendrikd you can pull these changes into 2.3, e. g.:

git fetch upstream
git checkout -b daschuer-touchfix upstream/2.3
git pull https://github.com/daschuer/mixxx.git touchfix

daschuer · 2020-10-09T06:47:35Z

unfortunately that conflicts.

I have prepared touchfix24 on top of master for testing:

git pull https://github.com/daschuer/mixxx.git touchfix24

ehendrikd · 2020-10-09T09:46:19Z

Thank you, however I am perhaps a bit confused, the setAttribute(Qt::WA_AcceptTouchEvents); statement still exists in https://github.com/daschuer/mixxx/blob/touchfix24/src/mixxx.cpp#L219 but does not in https://github.com/daschuer/mixxx/blob/touchfix/src/mixxx.cpp

daschuer · 2020-10-09T09:56:46Z

ups...
You are right if have missed to commit the merge.
Now it is up-to-date.

ehendrikd · 2020-10-09T11:13:31Z

I can confirm https://github.com/daschuer/mixxx/tree/touchfix24 compiles and fixes the touchscreen issues on Raspberry Pis.

Swiftb0y · 2020-10-09T11:51:43Z

I also tested the PR on top of master (so I could use CMake because I don't have scons set up) and it also fixes the same issue I mentioned on my touchscreen laptop (running f32 on wayland). The library is also usable again, though obviously gestures for scrolling and so forth don't work. Also knobs are still unusable on a touchscreen which is a different issue, but other than that, touch works again.

daschuer · 2020-10-09T14:05:58Z

Thank you for confirm.

Which gesture is used for scrolling?

Did you map the "touch_shift" control to access the second feature of the buttons?

daschuer · 2020-10-09T14:15:01Z

There is a QScroller class that enables kinetic scrolling. Maybe we should introduce this.
https://doc.qt.io/qt-5/qscroller.html

By the way, here I can already scroll with two fingers.

uklotzde

I am not able to test this, just some comments about the ugly code that lacks an explanation.

uklotzde · 2020-10-11T21:59:51Z

src/widget/wwidget.cpp

@@ -38,7 +38,7 @@ WWidget::~WWidget() {
 }

 bool WWidget::touchIsRightButton() {
-    return (m_pTouchShift->get() != 0.0);
+    return (m_pTouchShift->toBool());


Redundant parantheses

uklotzde · 2020-10-11T22:00:11Z

src/mixxxapplication.cpp

 bool MixxxApplication::touchIsRightButton() {
    if (!m_pTouchShift) {
        m_pTouchShift = new ControlProxy(
                "[Controls]", "touch_shift", this);
    }
-    return (m_pTouchShift->get() != 0.0);
+    return (m_pTouchShift->toBool());


Redundant parantheses

uklotzde · 2020-10-11T22:02:41Z

src/mixxxapplication.cpp

+        QMouseEventEditable* mouseEvent = static_cast<QMouseEventEditable*>(event);
+        if (mouseEvent->source() == Qt::MouseEventSynthesizedByQt &&
+                mouseEvent->button() == Qt::LeftButton &&
+                m_rightPessedButtons > 0) {


VERIFY_OR_DEBUG_ASSERT(m_rightPessedButtons > 0) and early break otherwise?

Using a debug assert for increasing the counter but not for decreasing it would be inconsequent. Both parts of the code should be symmetrical.

m_rightPessedButtons is zero when there is no right button pressed. This is an expected case.
The assertion in the other path verifies the assumption that QT synthesizes only one click at a time. I will add a comment.

uklotzde · 2020-10-11T22:03:38Z

src/mixxxapplication.cpp

+                mouseEvent->button() == Qt::LeftButton &&
+                touchIsRightButton()) {
+            mouseEvent->setButton(Qt::RightButton);
+            m_rightPessedButtons++;


VERIFY_OR_DEBUG_ASSERT(m_rightPessedButtons < 2) and early break otherwise?

Solved, see above.

src/mixxxapplication.cpp

uklotzde · 2020-10-11T22:13:38Z

src/mixxxapplication.cpp

+class QMouseEventEditable : public QMouseEvent {
+  public:
+    // Inherit constructors from base class
+    using QMouseEvent::QMouseEvent;


This class must never be constructed.

Holzhaus · 2020-10-13T12:18:35Z

I converted this to draft since there are unresolved review comments.

daschuer · 2020-10-14T10:05:26Z

Done.

Holzhaus · 2020-10-18T12:41:30Z

There is a merge conflict now.

Holzhaus · 2020-10-24T13:06:47Z

Merge conflicts again.

daschuer · 2020-10-25T11:26:03Z

This is merge able again.

Be-ing · 2020-10-26T16:11:28Z

src/mixxxapplication.cpp

-          m_fakeMouseWidget(NULL),
-          m_activeTouchButton(Qt::NoButton),
-          m_pTouchShift(NULL) {
+          m_rightPessedButtons(0),


Suggested change

m_rightPessedButtons(0),

m_rightPressedButtons(0),

src/mixxxapplication.cpp

Be-ing · 2020-10-26T16:39:16Z

src/mixxx.cpp

@@ -219,7 +219,6 @@ void MixxxMainWindow::initialize(QApplication* pApp, const CmdlineArgs& args) {
        pConfig->getValue(ConfigKey("[Controls]", "Tooltips"),
                static_cast<int>(mixxx::TooltipsPreference::TOOLTIPS_ON)));

-    setAttribute(Qt::WA_AcceptTouchEvents);


I am concerned this hack may prevent us from implementing custom touch gestures. However, we currently have a major bug to fix so we can defer that issue.

Any widget can enable touch events individually.

This tells Qt that the MixxxMainWindow itself has a event handler that accept touch events.
This hack was required in early Qt versions to detect that no child widget has consumed the touch and we could resend it as mouse click. Now Qt calculated this forehead, which disables the mouse click synthesizer.

Be-ing · 2020-10-26T17:00:32Z

This fixes touch input for the library but there is still the critical bug that no onscreen keyboard is shown when searching the library.

Co-authored-by: Be <be.0@gmx.com>

daschuer · 2020-10-27T19:37:16Z

Done.

daschuer · 2020-10-28T07:02:16Z

CI failures are unrelated.

Be-ing · 2020-10-28T23:26:05Z

Looks good to me. Waiting for CI.

Be-ing · 2020-10-29T16:32:51Z

There is a merge conflict with CHANGELOG now.

Be-ing · 2020-10-29T16:35:11Z

I don't know what's going on with the CI failures on the 2.2 branch but it doesn't seem to be related to the changes in this PR.

daschuer · 2020-10-29T17:38:38Z

That is actually the fifth time this PR is in conflict due to CHANGELOG
Is there a way to avoid it? It is really anoying.

daschuer · 2020-10-29T17:45:50Z

https://about.gitlab.com/blog/2018/07/03/solving-gitlabs-changelog-conflict-crisis/

daschuer · 2020-10-31T12:03:40Z

Done.

daschuer added 3 commits October 8, 2020 23:17

make use of toBool()

e03d6f8

Make use of QT's MouseEvent Synthesizer but modify the mouse button a…

f607ce8

…ccording to "touch_shift"

Update CHANGELOG

1ef74d9

daschuer added this to the 2.2.5 milestone Oct 8, 2020

uklotzde suggested changes Oct 11, 2020

View reviewed changes

Holzhaus added major bug ui labels Oct 13, 2020

Holzhaus marked this pull request as draft October 13, 2020 12:18

daschuer added 3 commits October 14, 2020 10:19

Remove redundant parentheses

0139cba

Improve comments and only allow one right click at a time.

9e7c957

Removed constructor and added comments to the QMouseEventEditable class

73db83f

daschuer marked this pull request as ready for review October 14, 2020 10:05

daschuer added 3 commits October 18, 2020 19:35

Merge remote-tracking branch 'upstream/2.2' into touchfix

e2e3c30

Merge remote-tracking branch 'upstream/2.2' into touchfix

7369589

Move to Xenial since Trusty has been abdoned

d76c5f9

daschuer force-pushed the touchfix branch from 1d47b45 to d76c5f9 Compare October 23, 2020 11:58

Merge remote-tracking branch 'upstream/2.2' into touchfix

7f03257

Holzhaus marked this pull request as draft October 24, 2020 13:06

Merge remote-tracking branch 'upstream/2.2' into touchfix

be53d9f

daschuer marked this pull request as ready for review October 25, 2020 11:25

Be-ing reviewed Oct 26, 2020

View reviewed changes

src/mixxxapplication.cpp Outdated Show resolved Hide resolved

Be-ing reviewed Oct 26, 2020

View reviewed changes

daschuer and others added 2 commits October 27, 2020 20:33

Fix typo

8432b36

Update comments

bb57e8c

Co-authored-by: Be <be.0@gmx.com>

Set the source of the Syntesized QMouseEvent

e70ea15

Holzhaus marked this pull request as draft October 30, 2020 15:43

Merge remote-tracking branch 'upstream/2.2' into touchfix

8563d47

daschuer marked this pull request as ready for review October 31, 2020 12:03

Be-ing merged commit 9a3a1e7 into mixxxdj:2.2 Oct 31, 2020

uklotzde modified the milestones: 2.2.5, 2.3.0 May 11, 2021

daschuer deleted the touchfix branch September 26, 2021 17:38

ronso0 mentioned this pull request Aug 30, 2022

Knobs/sliders: avoid stuck 'pressed' state after resetting with Ctrl + left-click on macOS #10839

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix touch control #3165

Fix touch control #3165

daschuer commented Oct 8, 2020

ehendrikd commented Oct 9, 2020

Holzhaus commented Oct 9, 2020

daschuer commented Oct 9, 2020 •

edited

Loading

ehendrikd commented Oct 9, 2020

daschuer commented Oct 9, 2020

ehendrikd commented Oct 9, 2020

Swiftb0y commented Oct 9, 2020

daschuer commented Oct 9, 2020

daschuer commented Oct 9, 2020 •

edited

Loading

uklotzde left a comment

uklotzde Oct 11, 2020

uklotzde Oct 11, 2020

uklotzde Oct 11, 2020

daschuer Oct 14, 2020

uklotzde Oct 11, 2020

daschuer Oct 27, 2020

uklotzde Oct 11, 2020

Holzhaus commented Oct 13, 2020

daschuer commented Oct 14, 2020

Holzhaus commented Oct 18, 2020

Holzhaus commented Oct 24, 2020

daschuer commented Oct 25, 2020

Be-ing Oct 26, 2020

Be-ing Oct 26, 2020

daschuer Oct 26, 2020

Be-ing commented Oct 26, 2020

daschuer commented Oct 27, 2020

daschuer commented Oct 28, 2020

Be-ing commented Oct 28, 2020

Be-ing commented Oct 29, 2020

Be-ing commented Oct 29, 2020

daschuer commented Oct 29, 2020

daschuer commented Oct 29, 2020

daschuer commented Oct 31, 2020

Fix touch control #3165

Fix touch control #3165

Conversation

daschuer commented Oct 8, 2020

ehendrikd commented Oct 9, 2020

Holzhaus commented Oct 9, 2020

daschuer commented Oct 9, 2020 • edited Loading

ehendrikd commented Oct 9, 2020

daschuer commented Oct 9, 2020

ehendrikd commented Oct 9, 2020

Swiftb0y commented Oct 9, 2020

daschuer commented Oct 9, 2020

daschuer commented Oct 9, 2020 • edited Loading

uklotzde left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Holzhaus commented Oct 13, 2020

daschuer commented Oct 14, 2020

Holzhaus commented Oct 18, 2020

Holzhaus commented Oct 24, 2020

daschuer commented Oct 25, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Be-ing commented Oct 26, 2020

daschuer commented Oct 27, 2020

daschuer commented Oct 28, 2020

Be-ing commented Oct 28, 2020

Be-ing commented Oct 29, 2020

Be-ing commented Oct 29, 2020

daschuer commented Oct 29, 2020

daschuer commented Oct 29, 2020

daschuer commented Oct 31, 2020

daschuer commented Oct 9, 2020 •

edited

Loading

daschuer commented Oct 9, 2020 •

edited

Loading