Changeset 90872 in vbox for trunk/src/VBox

Timestamp:

Aug 25, 2021 11:28:56 AM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Moving overlay label management from paintevent to a separate function.

Location:

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

Files:

• UIHelpViewer.cpp (modified) (4 diffs)
• UIHelpViewer.h (modified) (1 diff)

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

@@ -708 +708 @@
         painter.fillRect(fillRect, Qt::white);
         painter.drawPixmap(imageRect, newPixmap, newPixmap.rect());
-    }
-    if (m_pOverlayLabel)
-    {
-        if (m_fOverlayMode && !m_pOverlayLabel->isVisible())
-        {
-            /* 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));
-            m_pOverlayLabel->show();
-
-            /* 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);
-        }
-        if (!m_fOverlayMode && m_pOverlayLabel->isVisible())
-            m_pOverlayLabel->hide();
     }
 }
@@ -1000 +970 @@
 void UIHelpViewer::clearOverlay()
 {
+    AssertReturnVoid(m_pOverlayLabel);
     setImageOverCursor(cursor().pos());
 
@@ -1008 +979 @@
     if (m_pOverlayBlurEffect)
         m_pOverlayBlurEffect->setEnabled(false);
+    m_pOverlayLabel->hide();
+}
+
+void UIHelpViewer::enableOverlay()
+{
+    AssertReturnVoid(m_pOverlayLabel);
+    m_fOverlayMode = true;
+    if (m_pOverlayBlurEffect)
+        m_pOverlayBlurEffect->setEnabled(true);
+    viewport()->setCursor(m_defaultCursor);
+    m_fCursorChanged = false;
+    toggleFindInPageWidget(false);
+
+    /* 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));
+    m_pOverlayLabel->show();
+
+    /* 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);
 }
 
@@ -1039 +1045 @@
         m_overlayPixmap.loadFromData(fileData,"PNG");
         if (!m_overlayPixmap.isNull())
-        {
-            m_fOverlayMode = true;
-            if (m_pOverlayBlurEffect)
-                m_pOverlayBlurEffect->setEnabled(true);
-            viewport()->setCursor(m_defaultCursor);
-            m_fCursorChanged = false;
-            toggleFindInPageWidget(false);
-        }
+            enableOverlay();
     }
 }

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

@@ -129 +129 @@
     void loadImageAtPosition(const QPoint &globalPosition);
     void clearOverlay();
+    void enableOverlay();
     void setImageOverCursor(QPoint globalPosition);