Changeset 140323 in webkit

Timestamp:

Jan 21, 2013 4:45:24 AM (11 years ago)

Author:

vivek.vg@samsung.com

Message:

QtTestBrowser should provide way to clear selected elements
​https://bugs.webkit.org/show_bug.cgi?id=107437

Reviewed by Simon Hausmann.

Provide a way to "Clear selection" in the "Develop" menu to clear the previous search highlight.
Invoke the clearSelection prior to highlighting new elements.

• QtTestBrowser/launcherwindow.cpp:

(ElementHighlight):
(LauncherWindow::createChrome):
(LauncherWindow::selectElements):
(LauncherWindow::clearSelection):

• QtTestBrowser/launcherwindow.h:

(LauncherWindow):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (3 diffs)
• QtTestBrowser/launcherwindow.h (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-21  Vivek Galatage  <vivek.vg@samsung.com>
+
+        QtTestBrowser should provide way to clear selected elements
+        https://bugs.webkit.org/show_bug.cgi?id=107437
+
+        Reviewed by Simon Hausmann.
+
+        Provide a way to "Clear selection" in the "Develop" menu to clear the previous search highlight.
+        Invoke the clearSelection prior to highlighting new elements.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (ElementHighlight):
+        (LauncherWindow::createChrome):
+        (LauncherWindow::selectElements):
+        (LauncherWindow::clearSelection):
+        * QtTestBrowser/launcherwindow.h:
+        (LauncherWindow):
+
 2013-01-21  Jochen Eisinger  <jochen@chromium.org>
 

trunk/Tools/QtTestBrowser/launcherwindow.cpp

@@ -74 +74 @@
 #endif
 
+struct HighlightedElement {
+    QWebElement m_element;
+    QString m_previousStyle;
+};
+
 const int gExitClickArea = 80;
 QVector<int> LauncherWindow::m_zoomLevels;
@@ -362 +367 @@
 
     toolsMenu->addAction("Select Elements...", this, SLOT(selectElements()));
+
+    toolsMenu->addAction("Clear selection", this, SLOT(clearSelection()));
 
     QAction* showInspectorAction = toolsMenu->addAction("Show Web Inspector", m_inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I));
@@ -813 +820 @@
 
     if (ok && !str.isEmpty()) {
+        clearSelection();
         QWebElementCollection result =  page()->mainFrame()->findAllElements(str);
-        foreach (QWebElement e, result)
+        foreach (QWebElement e, result) {
+            HighlightedElement el = { e, e.styleProperty("background-color", QWebElement::InlineStyle) };
+            m_highlightedElements.append(el);
             e.setStyleProperty("background-color", "yellow");
+        }
         statusBar()->showMessage(QString("%1 element(s) selected").arg(result.count()), 5000);
     }
 #endif
+}
+
+void LauncherWindow::clearSelection()
+{
+    for (int i = 0; i < m_highlightedElements.size(); ++i)
+        m_highlightedElements[i].m_element.setStyleProperty("background-color", m_highlightedElements[i].m_previousStyle);
+    m_highlightedElements.clear();
 }
 

trunk/Tools/QtTestBrowser/launcherwindow.h

@@ -61 +61 @@
 QT_END_NAMESPACE
 
+struct HighlightedElement;
+
 class WindowOptions {
 public:
@@ -182 +184 @@
     void animatedYFlip();
     void selectElements();
+    void clearSelection();
     void showFPS(bool enable);
     void showUserAgentDialog();
@@ -226 +229 @@
 #endif
     QList<QTouchEvent::TouchPoint> m_touchPoints;
+    QList<HighlightedElement> m_highlightedElements;
     bool m_touchMocking;