Bug 111430 – [Qt][MiniBrowser] Touch mocking broken for chained getures

• Component: New Bugs
• Status: RESOLVED FIXED

[Andras Becsi]

[Qt][MiniBrowser] Touch mocking broken for chained getures

[Andras Becsi]

Created attachment 191479 [details]
Patch

[Jocelyn Turcotte]

Comment on attachment 191479 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=191479&action=review

> Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:134
> +        QSet<int> currentlyHeldTouchPoints;

Could you do it the other way?
- if (m_touchPoints.contains(id) && !m_pressedMouseButtons.testFlag(Qt::MouseButton(id))) { ...; m_heldTouchPoints.remove(id); }
- Remove the call to m_heldTouchPoints.clear();

> Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:137
> +            if (m_touchPoints.contains(id) && !m_pressedMouseButtons.testFlag(Qt::MouseButton(id)))

Did you try with QGuiApplication::mouseButtons()?
I know at some point it wasn't working well, but if it does it would be cleaner.

[Jocelyn Turcotte]

(In reply to comment #2)
> Did you try with QGuiApplication::mouseButtons()?
> I know at some point it wasn't working well, but if it does it would be cleaner.

At least on Mac I recall it not working well pre 5.0.0

[Andras Becsi]

Created attachment 191495 [details]
Patch

[Andras Becsi]

(In reply to comment #3)
> (In reply to comment #2)
> > Did you try with QGuiApplication::mouseButtons()?
> > I know at some point it wasn't working well, but if it does it would be cleaner.
> 
> At least on Mac I recall it not working well pre 5.0.0
It works on Linux, I didn't test it on Mac, but from looking at the code in qguiapplication it should work on Mac too.

[Andras Becsi]

Created attachment 191496 [details]
Patch

[Andras Becsi]

(In reply to comment #6)
> Created an attachment (id=191496) [details]
> Patch

Also updated to use QGuiApplication::keyboardModifiers() for m_holdingControl, since it works now in Qt5.

[Jocelyn Turcotte]

Comment on attachment 191496 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=191496&action=review

r=me

> Tools/MiniBrowser/qt/MiniBrowserApplication.cpp:113
> +    m_holdingControl = QGuiApplication::keyboardModifiers().testFlag(Qt::ControlModifier);

Nit: could be worth mentioning in the ChangeLog

[Andras Becsi]

Committed r144915: <http://trac.webkit.org/changeset/144915>