Changeset 76930 in webkit

Timestamp:

Jan 28, 2011 5:06:31 AM (13 years ago)

Author:

zoltan@webkit.org

Message:

[Qt] Add Zoom Text Only action to MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=53297

Reviewed by Andreas Kling.

Add Zoom Text Only action to MiniBrowser's view menu, change zoom levels to avoid unnecessary divides.

• MiniBrowser/qt/BrowserWindow.cpp:

(BrowserWindow::BrowserWindow):
(BrowserWindow::zoomIn):
(BrowserWindow::zoomOut):
(BrowserWindow::resetZoom):
(BrowserWindow::toggleZoomTextOnly):
(BrowserWindow::applyZoom):

• MiniBrowser/qt/BrowserWindow.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/qt/BrowserWindow.cpp (modified) (7 diffs)
• MiniBrowser/qt/BrowserWindow.h (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-28  Zoltan Horvath  <zoltan@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Add Zoom Text Only action to MiniBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=53297
+
+        Add Zoom Text Only action to MiniBrowser's view menu, change zoom levels to avoid unnecessary divides.
+
+        * MiniBrowser/qt/BrowserWindow.cpp:
+        (BrowserWindow::BrowserWindow):
+        (BrowserWindow::zoomIn):
+        (BrowserWindow::zoomOut):
+        (BrowserWindow::resetZoom):
+        (BrowserWindow::toggleZoomTextOnly):
+        (BrowserWindow::applyZoom):
+        * MiniBrowser/qt/BrowserWindow.h:
+
 2011-01-28  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

@@ -37 +37 @@
 QGraphicsWKView::BackingStoreType BrowserWindow::backingStoreTypeForNewWindow = QGraphicsWKView::Simple;
 
-QVector<int> BrowserWindow::m_zoomLevels;
+QVector<qreal> BrowserWindow::m_zoomLevels;
 
 BrowserWindow::BrowserWindow(QWKContext* context)
-    : m_currentZoom(100) ,
-      m_browser(new BrowserView(backingStoreTypeForNewWindow, context))
+    : m_isZoomTextOnly(false)
+    , m_currentZoom(1)
+    , m_browser(new BrowserView(backingStoreTypeForNewWindow, context))
 {
     setAttribute(Qt::WA_DeleteOnClose);
@@ -65 +66 @@
     QAction* zoomOut = viewMenu->addAction("Zoom &Out", this, SLOT(zoomOut()));
     QAction* resetZoom = viewMenu->addAction("Reset Zoom", this, SLOT(resetZoom()));
+    QAction* zoomText = viewMenu->addAction("Zoom Text Only", this, SLOT(toggleZoomTextOnly(bool)));
+    zoomText->setCheckable(true);
+    zoomText->setChecked(false);
 
     zoomIn->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Plus));
@@ -90 +94 @@
     // the zoom values are chosen to be like in Mozilla Firefox 3
     if (!m_zoomLevels.count()) {
-        m_zoomLevels << 30 << 50 << 67 << 80 << 90;
-        m_zoomLevels << 100;
-        m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+        m_zoomLevels << 0.3 << 0.5 << 0.67 << 0.8 << 0.9;
+        m_zoomLevels << 1;
+        m_zoomLevels << 1.1 << 1.2 << 1.33 << 1.5 << 1.7 << 2 << 2.4 << 3;
     }
 
@@ -178 +182 @@
 void BrowserWindow::zoomIn()
 {
+    if (m_isZoomTextOnly)
+        m_currentZoom = page()->textZoomFactor();
+    else
+        m_currentZoom = page()->pageZoomFactor();
+
     int i = m_zoomLevels.indexOf(m_currentZoom);
     Q_ASSERT(i >= 0);
@@ -188 +197 @@
 void BrowserWindow::zoomOut()
 {
+    if (m_isZoomTextOnly)
+        m_currentZoom = page()->textZoomFactor();
+    else
+        m_currentZoom = page()->pageZoomFactor();
+
     int i = m_zoomLevels.indexOf(m_currentZoom);
     Q_ASSERT(i >= 0);
@@ -198 +212 @@
 void BrowserWindow::resetZoom()
 {
-    m_currentZoom = 100;
+    m_currentZoom = 1;
     applyZoom();
+}
+
+void BrowserWindow::toggleZoomTextOnly(bool b)
+{
+    m_isZoomTextOnly = b;
 }
 
@@ -252 +271 @@
 void BrowserWindow::applyZoom()
 {
-    page()->setPageZoomFactor(qreal(m_currentZoom) / 100.0);
+    if (m_isZoomTextOnly)
+        page()->setTextZoomFactor(m_currentZoom);
+    else
+        page()->setPageZoomFactor(m_currentZoom);
 }
 

trunk/Tools/MiniBrowser/qt/BrowserWindow.h

@@ -61 +61 @@
     void zoomOut();
     void resetZoom();
+    void toggleZoomTextOnly(bool on);
 
     void showUserAgentDialog();
@@ -69 +70 @@
     void applyZoom();
 
-    static QVector<int> m_zoomLevels;
-    int m_currentZoom;
+    static QVector<qreal> m_zoomLevels;
+    bool m_isZoomTextOnly;
+    qreal m_currentZoom;
 
     BrowserView* m_browser;