Changeset 56179 in webkit

Timestamp:

Mar 18, 2010 12:14:24 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-18 Antti Koivisto <​koivisto@iki.fi>

Reviewed by Kenneth Rohde Christiansen.

​https://bugs.webkit.org/show_bug.cgi?id=36102
[Qt] Scaling control API for tiled backing store

Add animated smooth zooming to Qt launcher when in tiled mode.

• QtLauncher/main.cpp: (LauncherWindow::LauncherWindow): (LauncherWindow::zoomAnimationFinished): (LauncherWindow::applyZoom): (LauncherWindow::zoomIn): (LauncherWindow::zoomOut):
• QtLauncher/webview.h: (WebViewGraphicsBased::graphicsWebView):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (7 diffs)
• QtLauncher/webview.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-18  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36102
+        [Qt] Scaling control API for tiled backing store
+        
+        Add animated smooth zooming to Qt launcher when in tiled mode.
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::zoomAnimationFinished):
+        (LauncherWindow::applyZoom):
+        (LauncherWindow::zoomIn):
+        (LauncherWindow::zoomOut):
+        * QtLauncher/webview.h:
+        (WebViewGraphicsBased::graphicsWebView):
+
 2010-03-18  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -107 +107 @@
     void resetZoom();
     void toggleZoomTextOnly(bool on);
+    void zoomAnimationFinished();
 
     void print();
@@ -139 +140 @@
 private:
     void createChrome();
+    void applyZoom();
 
 private:
@@ -150 +152 @@
     QAction* m_flipAnimated;
     QAction* m_flipYAnimated;
+
+    QPropertyAnimation* m_zoomAnimation;
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
@@ -169 +173 @@
     , m_flipAnimated(0)
     , m_flipYAnimated(0)
+    , m_zoomAnimation(0)
 {
     if (other) {
@@ -426 +431 @@
 }
 
+void LauncherWindow::zoomAnimationFinished()
+{
+    if (!isGraphicsBased())
+        return;
+    QGraphicsWebView* view = static_cast<WebViewGraphicsBased*>(m_view)->graphicsWebView();
+    view->setTiledBackingStoreFrozen(false);
+}
+
+void LauncherWindow::applyZoom()
+{
+    if (isGraphicsBased() && page()->settings()->testAttribute(QWebSettings::TiledBackingStoreEnabled)) {
+        QGraphicsWebView* view = static_cast<WebViewGraphicsBased*>(m_view)->graphicsWebView();
+        view->setTiledBackingStoreFrozen(true);
+        if (!m_zoomAnimation) {
+            m_zoomAnimation = new QPropertyAnimation(view, "scale");
+            m_zoomAnimation->setStartValue(view->scale());
+            connect(m_zoomAnimation, SIGNAL(finished()), this, SLOT(zoomAnimationFinished()));
+        } else {
+            m_zoomAnimation->stop();
+            m_zoomAnimation->setStartValue(m_zoomAnimation->currentValue());
+        }
+
+        m_zoomAnimation->setDuration(300);
+        m_zoomAnimation->setEndValue(qreal(m_currentZoom) / 100.);
+        m_zoomAnimation->start();
+        return;
+    }
+    page()->mainFrame()->setZoomFactor(qreal(m_currentZoom) / 100.0);
+}
+
 void LauncherWindow::zoomIn()
 {
@@ -433 +468 @@
         m_currentZoom = m_zoomLevels[i + 1];
 
-    page()->mainFrame()->setZoomFactor(qreal(m_currentZoom) / 100.0);
+    applyZoom();
 }
 
@@ -442 +477 @@
     if (i > 0)
         m_currentZoom = m_zoomLevels[i - 1];
-
-    page()->mainFrame()->setZoomFactor(qreal(m_currentZoom) / 100.0);
+    
+    applyZoom();
 }
 

trunk/WebKitTools/QtLauncher/webview.h

@@ -98 +98 @@
         return m_yRotation;
     }
+    
+    GraphicsWebView* graphicsWebView() const { return m_item; }
 
 public slots: