Changeset 88499 in vbox

Timestamp:

Apr 13, 2021 5:33:29 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

143760

Message:

FE/Qt: bugref:9831. Reviving click to zoom functionality.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp (modified) (3 diffs)

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

@@ -592 +592 @@
 void UIHelpViewer::mouseReleaseEvent(QMouseEvent *pEvent)
 {
-    // bool fOverlayMode = m_fOverlayMode;
+    bool fOverlayMode = m_fOverlayMode;
     clearOverlay();
 
@@ -608 +608 @@
     QIWithRetranslateUI<QTextBrowser>::mouseReleaseEvent(pEvent);
 
-    // if (!fOverlayMode)
-    //     loadImageAtPosition(pEvent->globalPos());
+    if (!fOverlayMode)
+        loadImageAtPosition(pEvent->globalPos());
 }
 
@@ -660 +660 @@
         painter.fillRect(fillRect, Qt::white);
         painter.drawPixmap(imageRect, newPixmap, newPixmap.rect());
-     }
-    // if (m_pOverlayLabel)
-    // {
-    //     if (m_fOverlayMode)
-    //     {
-    //         /* Scale the image to 1:1 as long as it fits into avaible space (minus some margins and scrollbar sizes): */
-    //         int vWidth = 0;
-    //         if (verticalScrollBar() && verticalScrollBar()->isVisible())
-    //             vWidth = verticalScrollBar()->width();
-    //         int hMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) +
-    //             qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) + vWidth;
-
-    //         int hHeight = 0;
-    //         if (horizontalScrollBar() && horizontalScrollBar()->isVisible())
-    //             hHeight = horizontalScrollBar()->height();
-    //         int vMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) +
-    //             qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) + hHeight;
-
-    //         QSize size(qMin(width() - hMargin, m_overlayPixmap.width()),
-    //                     qMin(height() - vMargin, m_overlayPixmap.height()));
-    //         m_pOverlayLabel->setPixmap(m_overlayPixmap.scaled(size,  Qt::KeepAspectRatio, Qt::SmoothTransformation));
-    //         /* Center the label: */
-    //         int x = 0.5 * (width() - vWidth - m_pOverlayLabel->width());
-    //         int y = 0.5 * (height() - hHeight - m_pOverlayLabel->height());
-    //         m_pOverlayLabel->move(x, y);
-    //         m_pOverlayLabel->show();
-    //     }
-    //     else
-    //         m_pOverlayLabel->hide();
-    // }
+    }
+    if (m_pOverlayLabel)
+    {
+        if (m_fOverlayMode)
+        {
+            /* Scale the image to 1:1 as long as it fits into avaible space (minus some margins and scrollbar sizes): */
+            int vWidth = 0;
+            if (verticalScrollBar() && verticalScrollBar()->isVisible())
+                vWidth = verticalScrollBar()->width();
+            int hMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) +
+                qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) + vWidth;
+
+            int hHeight = 0;
+            if (horizontalScrollBar() && horizontalScrollBar()->isVisible())
+                hHeight = horizontalScrollBar()->height();
+            int vMargin = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) +
+                qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) + hHeight;
+
+            QSize size(qMin(width() - hMargin, m_overlayPixmap.width()),
+                       qMin(height() - vMargin, m_overlayPixmap.height()));
+            m_pOverlayLabel->setPixmap(m_overlayPixmap.scaled(size,  Qt::KeepAspectRatio, Qt::SmoothTransformation));
+            /* Center the label: */
+            int x = 0.5 * (width() - vWidth - m_pOverlayLabel->width());
+            int y = 0.5 * (height() - hHeight - m_pOverlayLabel->height());
+            m_pOverlayLabel->move(x, y);
+            m_pOverlayLabel->show();
+        }
+        else
+            m_pOverlayLabel->hide();
+    }
 }