Changeset 95251 in vbox

Timestamp:

Jun 12, 2022 5:01:37 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. A better handling of the zoom operation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (18 diffs)
• UIHelpViewer.cpp (modified) (6 diffs)
• UIHelpViewer.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -74 +74 @@
 static const int iBookmarkUrlDataType = 6;
 
+static int iZoomPercentageStep = 20;
+const QPair<int, int> zoomPercentageMinMax = QPair<int, int>(20, 300);
 
 /*********************************************************************************************************************************
@@ -196 +198 @@
     void sigLinkHighlighted(const QString &strLink);
 #endif
-    void sigZoomPercentageChanged(int iPercentage);
     void sigFindInPageWidgetVisibilityChanged(bool fVisible);
     void sigHistoryChanged(bool fBackwardAvailable, bool fForwardAvailable);
     void sigMouseOverImage(const QString &strImageName);
+    void sigZoomRequest(UIHelpViewer::ZoomOperation enmZoomOperation);
 
 public:
@@ -211 +213 @@
     void setToolBarVisible(bool fVisible);
     void print(QPrinter &printer);
-    void zoom(UIHelpViewer::ZoomOperation enmZoomOperation);
-    int zoomPercentage() const;
     void setZoomPercentage(int iZoomPercentage);
     void setHelpFileList(const QList<QUrl> &helpFileList);
@@ -302 +302 @@
     void printCurrent(QPrinter &printer);
     void switchToTab(int iIndex);
-    /** Returns the zoom percentage of 0th tab. */
     int zoomPercentage() const;
-    /** Sets the zoom percentage of all tabs. */
     void setZoomPercentage(int iZoomPercentage);
     void setHelpFileList(const QList<QUrl> &helpFileList);
@@ -318 +316 @@
     void sltCloseCurrentTab();
     void sltCloseOtherTabs();
-    void sltZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation);
     void sltHomeAction();
     void sltAddBookmarkAction();
@@ -324 +321 @@
     void sltBackwardAction();
     void sltReloadPageAction();
+    void sltHandleZoomRequest(UIHelpViewer::ZoomOperation enmOperation);
 
 private slots:
@@ -356 +354 @@
     QStringList m_tabTitleList;
     QList<QUrl> m_helpFileList;
+    /** As percentage. */
+    int m_iZoomPercentage;
 };
 
@@ -624 +624 @@
 }
 
-void UIHelpBrowserTab::zoom(UIHelpViewer::ZoomOperation enmZoomOperation)
-{
-    if (m_pContentViewer)
-        m_pContentViewer->zoom(enmZoomOperation);
-}
-
 void UIHelpBrowserTab::setZoomPercentage(int iZoomPercentage)
 {
@@ -672 +666 @@
     if (m_pContentViewer)
         return m_pContentViewer->sltSelectPreviousMatch();
-}
-
-int UIHelpBrowserTab::zoomPercentage() const
-{
-    if (m_pContentViewer)
-        return m_pContentViewer->zoomPercentage();
-    return 100;
 }
 
@@ -723 +710 @@
             this, &UIHelpBrowserTab::sigLinkHighlighted);
 #endif
-    connect(m_pContentViewer, &UIHelpViewer::sigZoomPercentageChanged,
-            this, &UIHelpBrowserTab::sigZoomPercentageChanged);
     connect(m_pContentViewer, &UIHelpViewer::copyAvailable,
             this, &UIHelpBrowserTab::sigCopyAvailableChanged);
@@ -731 +716 @@
     connect(m_pContentViewer, &UIHelpViewer::sigMouseOverImage,
             this, &UIHelpBrowserTab::sigMouseOverImage);
+    connect(m_pContentViewer, &UIHelpViewer::sigZoomRequest,
+            this, &UIHelpBrowserTab::sigZoomRequest);
 
     m_pContentViewer->setSource(initialUrl);
@@ -929 +916 @@
     , m_fSwitchToNewTab(true)
     , m_fToolBarVisible(true)
+    , m_iZoomPercentage(100)
 {
     Q_UNUSED(m_fSwitchToNewTab);
@@ -956 +944 @@
     connect(pTabWidget, &UIHelpBrowserTab::sigAddBookmark,
             this, &UIHelpBrowserTabManager::sigAddBookmark);
-    connect(pTabWidget, &UIHelpBrowserTab::sigZoomPercentageChanged,
-            this, &UIHelpBrowserTabManager::sigZoomPercentageChanged);
     connect(pTabWidget, &UIHelpBrowserTab::sigLinkHighlighted,
             this, &UIHelpBrowserTabManager::sigLinkHighlighted);
@@ -968 +954 @@
    connect(pTabWidget, &UIHelpBrowserTab::sigMouseOverImage,
             this, &UIHelpBrowserTabManager::sigMouseOverImage);
+   connect(pTabWidget, &UIHelpBrowserTab::sigZoomRequest,
+            this, &UIHelpBrowserTabManager::sltHandleZoomRequest);
 
    pTabWidget->setZoomPercentage(zoomPercentage());
-    pTabWidget->setHelpFileList(m_helpFileList);
-    setFocusProxy(pTabWidget);
-    if (!fBackground)
-        setCurrentIndex(index);
+   pTabWidget->setHelpFileList(m_helpFileList);
+   setFocusProxy(pTabWidget);
+   if (!fBackground)
+       setCurrentIndex(index);
 }
 
@@ -1110 +1098 @@
 int UIHelpBrowserTabManager::zoomPercentage() const
 {
-    UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(0));
-    if (pTab)
-        return pTab->zoomPercentage();
-    return 100;
-}
-
-void UIHelpBrowserTabManager::setZoomPercentage(int iZoomPercentage)
-{
-    for (int i = 0; i < count(); ++i)
-    {
-        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
-        if (pTab)
-            pTab->setZoomPercentage(iZoomPercentage);
-    }
+    return m_iZoomPercentage;
 }
 
@@ -1256 +1231 @@
 }
 
-void UIHelpBrowserTabManager::sltZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation)
-{
-    for (int i = 0; i < count(); ++i)
-    {
-        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
-        if (pTab)
-            pTab->zoom(enmZoomOperation);
-    }
-}
-
 void UIHelpBrowserTabManager::sltShowTabBarContextMenu(const QPoint &pos)
 {
@@ -1308 +1273 @@
     if (pTab)
         pTab->sltBackwardAction();
+}
+
+void UIHelpBrowserTabManager::sltHandleZoomRequest(UIHelpViewer::ZoomOperation enmOperation)
+{
+    int iZoomPercentage = m_iZoomPercentage;
+    switch (enmOperation)
+    {
+        case UIHelpViewer::ZoomOperation_In:
+            iZoomPercentage += iZoomPercentageStep;
+            break;
+        case UIHelpViewer::ZoomOperation_Out:
+            iZoomPercentage -= iZoomPercentageStep;
+            break;
+        case UIHelpViewer::ZoomOperation_Reset:
+        default:
+            iZoomPercentage = 100;
+            break;
+    }
+    setZoomPercentage(iZoomPercentage);
+}
+
+void UIHelpBrowserTabManager::setZoomPercentage(int iZoomPercentage)
+{
+
+    if (iZoomPercentage > zoomPercentageMinMax.second ||
+        iZoomPercentage < zoomPercentageMinMax.first)
+        return;
+
+    m_iZoomPercentage = iZoomPercentage;
+
+    for (int i = 0; i < count(); ++i)
+    {
+        UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(widget(i));
+        if (pTab)
+            pTab->setZoomPercentage(m_iZoomPercentage);
+    }
+    emit sigZoomPercentageChanged(m_iZoomPercentage);
 }
 
@@ -2224 +2226 @@
         return;
     UIHelpViewer::ZoomOperation enmOperation = (UIHelpViewer::ZoomOperation)(iZoomOperation);
-    m_pTabManager->sltZoomOperation(enmOperation);
+    m_pTabManager->sltHandleZoomRequest(enmOperation);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -55 +55 @@
 #ifdef VBOX_WITH_QHELP_VIEWER
 
-static int iZoomPercentageStep = 20;
-const QPair<int, int> UIHelpViewer::zoomPercentageMinMax = QPair<int, int>(20, 300);
-
-
 /*********************************************************************************************************************************
 *   UIContextMenuNavigationAction definition.                                                                                    *
@@ -402 +398 @@
     , m_iSelectedMatchIndex(0)
     , m_iSearchTermLength(0)
-    , m_iZoomPercentage(100)
     , m_fOverlayMode(false)
     , m_fCursorChanged(false)
     , m_pOverlayLabel(0)
+    , m_iZoomPercentage(100)
 {
     m_iInitialFontPointSize = font().pointSize();
@@ -546 +542 @@
 }
 
-void UIHelpViewer::zoom(ZoomOperation enmZoomOperation)
-{
+void UIHelpViewer::setZoomPercentage(int iZoomPercentage)
+{
+    m_iZoomPercentage = iZoomPercentage;
     clearOverlay();
-    int iPrevZoom = m_iZoomPercentage;
-    switch (enmZoomOperation)
-    {
-        case ZoomOperation_In:
-            iPrevZoom += iZoomPercentageStep;
-            break;
-        case ZoomOperation_Out:
-            iPrevZoom -= iZoomPercentageStep;
-            break;
-        case ZoomOperation_Reset:
-        default:
-            iPrevZoom = 100;
-            break;
-    }
-    setZoomPercentage(iPrevZoom);
-}
-
-void UIHelpViewer::setZoomPercentage(int iZoomPercentage)
-{
-    if (iZoomPercentage > zoomPercentageMinMax.second ||
-        iZoomPercentage < zoomPercentageMinMax.first ||
-        m_iZoomPercentage == iZoomPercentage)
-        return;
-
-    m_iZoomPercentage = iZoomPercentage;
     scaleFont();
     scaleImages();
-    emit sigZoomPercentageChanged(m_iZoomPercentage);
 }
 
@@ -590 +561 @@
 {
     return textCursor().hasSelection();
-}
-
-int UIHelpViewer::zoomPercentage() const
-{
-    return m_iZoomPercentage;
 }
 
@@ -690 +656 @@
     {
         if (pEvent->angleDelta().y() > 0)
-            zoom(ZoomOperation_In);
+            emit sigZoomRequest(ZoomOperation_In);
         else if (pEvent->angleDelta().y() < 0)
-            zoom(ZoomOperation_Out);
+            emit sigZoomRequest(ZoomOperation_Out);
     }
 }
@@ -804 +770 @@
         {
             case Qt::Key_Equal:
-                zoom(ZoomOperation_In);
+                emit sigZoomRequest(ZoomOperation_In);
                 break;
             case Qt::Key_Minus:
-                zoom(ZoomOperation_Out);
+                emit sigZoomRequest(ZoomOperation_Out);
                 break;
             case Qt::Key_0:
-                zoom(ZoomOperation_Reset);
+                emit sigZoomRequest(ZoomOperation_Reset);
                 break;
             default:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

@@ -46 +46 @@
     Q_OBJECT;
 
-signals:
-
-    void sigOpenLinkInNewTab(const QUrl &url, bool fBackground);
-    void sigFindInPageWidgetToogle(bool fVisible);
-    void sigFontPointSizeChanged(int iFontPointSize);
-    void sigGoBackward();
-    void sigGoForward();
-    void sigGoHome();
-    void sigAddBookmark();
-    void sigZoomPercentageChanged(int iPercentage);
-    void sigMouseOverImage(const QString &strImageName);
-
 public:
 
@@ -68 +56 @@
     };
 
+signals:
+
+    void sigOpenLinkInNewTab(const QUrl &url, bool fBackground);
+    void sigFindInPageWidgetToogle(bool fVisible);
+    void sigFontPointSizeChanged(int iFontPointSize);
+    void sigGoBackward();
+    void sigGoForward();
+    void sigGoHome();
+    void sigAddBookmark();
+    void sigMouseOverImage(const QString &strImageName);
+    void sigZoomRequest(ZoomOperation enmZoomOperation);
+
+public:
+
     UIHelpViewer(const QHelpEngine *pHelpEngine, QWidget *pParent = 0);
     virtual QVariant loadResource(int type, const QUrl &name) RT_OVERRIDE;
@@ -76 +78 @@
     void setFont(const QFont &);
     bool isFindInPageWidgetVisible() const;
-    void zoom(ZoomOperation enmZoomOperation);
-    int zoomPercentage() const;
     void setZoomPercentage(int iZoomPercentage);
     void setHelpFileList(const QList<QUrl> &helpFileList);
@@ -155 +155 @@
     /** A container to store the original image sizes/positions in the document. key is image name value is DocumentImage. */
     QHash<QString, DocumentImage> m_imageMap;
-    /** As percentage. */
-    int m_iZoomPercentage;
     /** Used to change th document cursor back from m_handCursor. */
     QCursor m_defaultCursor;
@@ -167 +165 @@
     QLabel *m_pOverlayLabel;
     QGraphicsBlurEffect *m_pOverlayBlurEffect;
+    int m_iZoomPercentage;
 };