Title: [106356] trunk/Tools
Revision
106356
Author
[email protected]
Date
2012-01-31 06:03:35 -0800 (Tue, 31 Jan 2012)

Log Message

[Qt] MiniBrowser: Show touch mocking indicators only when Ctrl is held down.
https://bugs.webkit.org/show_bug.cgi?id=77221

Reviewed by Kenneth Rohde Christiansen.

This makes sure that the indicator isn't in the way when doing clicks or dealing with the rest of the UI.

* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::sendTouchEvent):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (106355 => 106356)


--- trunk/Tools/ChangeLog	2012-01-31 13:47:59 UTC (rev 106355)
+++ trunk/Tools/ChangeLog	2012-01-31 14:03:35 UTC (rev 106356)
@@ -1,3 +1,15 @@
+2012-01-31  Jocelyn Turcotte  <[email protected]>
+
+        [Qt] MiniBrowser: Show touch mocking indicators only when Ctrl is held down.
+        https://bugs.webkit.org/show_bug.cgi?id=77221
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        This makes sure that the indicator isn't in the way when doing clicks or dealing with the rest of the UI.
+
+        * MiniBrowser/qt/MiniBrowserApplication.cpp:
+        (MiniBrowserApplication::sendTouchEvent):
+
 2012-01-26  Hans Wennborg  <[email protected]>
 
         Speech Input: move MockSpeechInputClient into Chromium DumpRenderTree implementation

Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (106355 => 106356)


--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2012-01-31 13:47:59 UTC (rev 106355)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp	2012-01-31 14:03:35 UTC (rev 106356)
@@ -181,8 +181,9 @@
     m_pendingFakeTouchEventCount++;
     QWindowSystemInterface::handleTouchEvent(browserWindow, device, m_touchPoints.values());
 
+    bool holdingControl = QApplication::keyboardModifiers().testFlag(Qt::ControlModifier);
     if (!m_windowOptions.useTraditionalDesktopBehavior())
-        browserWindow->updateVisualMockTouchPoints(m_touchPoints.values());
+        browserWindow->updateVisualMockTouchPoints(holdingControl ? m_touchPoints.values() : QList<QWindowSystemInterface::TouchPoint>());
 
     // Get rid of touch-points that are no longer valid
     foreach (const QWindowSystemInterface::TouchPoint& touchPoint, m_touchPoints) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to