Changeset 88430 in vbox for trunk

Timestamp:

Apr 9, 2021 11:42:55 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Some improvements on the tab ovelay mode.

Location:

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

Files:

• UIHelpViewer.cpp (modified) (12 diffs)
• UIHelpViewer.h (modified) (4 diffs)

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

@@ -345 +345 @@
     , m_iSearchTermLength(0)
     , m_iZoomPercentage(100)
-    , m_fImageOverlay(false)
-    , m_pOverlayWidget(0)
+    , m_fOverlayMode(false)
+    , m_fCursorChanged(false)
     , m_pOverlayLabel(0)
 {
@@ -368 +368 @@
     m_pFindInPageWidget->setVisible(false);
 
-
-    m_pOverlayWidget = new QWidget(this);
-    QHBoxLayout *overlayLayout = new QHBoxLayout(m_pOverlayWidget);
-    m_pOverlayLabel = new QLabel;
-    overlayLayout->addWidget(m_pOverlayLabel);
-    m_pOverlayWidget->hide();
+    m_pOverlayLabel = new QLabel(this);
+    if (m_pOverlayLabel)
+    {
+        m_pOverlayLabel->hide();
+        m_pOverlayLabel->installEventFilter(this);
+    }
 
     m_pOverlayBlurEffect = new QGraphicsBlurEffect(this);
-    viewport()->setGraphicsEffect(m_pOverlayBlurEffect);
-    m_pOverlayBlurEffect->setEnabled(false);
-    m_pOverlayBlurEffect->setBlurRadius(8);
+    if (m_pOverlayBlurEffect)
+    {
+        viewport()->setGraphicsEffect(m_pOverlayBlurEffect);
+        m_pOverlayBlurEffect->setEnabled(false);
+        m_pOverlayBlurEffect->setBlurRadius(8);
+    }
     retranslateUi();
 }
@@ -398 +401 @@
 void UIHelpViewer::setSource(const QUrl &url)
 {
+    clearOverlay();
     QTextBrowser::setSource(url);
     QTextDocument *pDocument = document();
     iterateDocumentImages();
     if (!pDocument || pDocument->isEmpty())
-    {
         setText(tr("<div><p><h3>404. Not found.</h3>The page <b>%1</b> could not be found.</p></div>").arg(url.toString()));
-    }
     if (m_pFindInPageWidget && m_pFindInPageWidget->isVisible())
     {
@@ -494 +496 @@
 }
 
+bool UIHelpViewer::isInOverlayMode() const
+{
+    return m_fOverlayMode;
+}
+
 int UIHelpViewer::zoomPercentage() const
 {
@@ -560 +567 @@
 void UIHelpViewer::resizeEvent(QResizeEvent *pEvent)
 {
+    clearOverlay();
     /* Make sure the widget stays inside the parent during parent resize: */
     if (m_pFindInPageWidget)
@@ -571 +579 @@
 void UIHelpViewer::wheelEvent(QWheelEvent *pEvent)
 {
-    if (m_fImageOverlay)
-        return;
-
+    if (m_fOverlayMode)
+        return;
     /* QTextBrowser::wheelEvent scales font when some modifiers are pressed. We dont want: */
     if (pEvent && pEvent->modifiers() == Qt::NoModifier)
@@ -581 +588 @@
 void UIHelpViewer::mousePressEvent(QMouseEvent *pEvent)
 {
-    if (m_fImageOverlay)
-        clearOverlay();
+    clearOverlay();
 
     QIWithRetranslateUI<QTextBrowser>::mousePressEvent(pEvent);
-
     QString strAnchor = anchorAt(pEvent->pos());
     if (!strAnchor.isEmpty())
@@ -596 +601 @@
         }
     }
-
     loadImageAtPosition(pEvent->globalPos());
 }
@@ -602 +606 @@
 void UIHelpViewer::mouseMoveEvent(QMouseEvent *pEvent)
 {
-    if (m_fImageOverlay)
-        return;
-
-    QIWithRetranslateUI<QTextBrowser>::mouseMoveEvent(pEvent);
+    if (m_fOverlayMode)
+        return;
 
     QPoint viewportCoordinates = viewport()->mapFromGlobal(pEvent->globalPos());
     QTextCursor cursor = cursorForPosition(viewportCoordinates);
-    if (cursor.charFormat().isImageFormat())
+    if (!m_fCursorChanged && cursor.charFormat().isImageFormat())
+    {
+        m_fCursorChanged = true;
         viewport()->setCursor(m_handCursor);
-    else
+    }
+    if (m_fCursorChanged && !cursor.charFormat().isImageFormat())
+    {
         viewport()->setCursor(m_defaultCursor);
+        m_fCursorChanged = false;
+    }
+    QIWithRetranslateUI<QTextBrowser>::mouseMoveEvent(pEvent);
 }
 
 void UIHelpViewer::mouseDoubleClickEvent(QMouseEvent *pEvent)
 {
-    if (m_fImageOverlay)
-        clearOverlay();
-
+    clearOverlay();
     QIWithRetranslateUI<QTextBrowser>::mouseDoubleClickEvent(pEvent);
 }
@@ -626 +633 @@
 {
     QIWithRetranslateUI<QTextBrowser>::paintEvent(pEvent);
-    // if (m_pOverlayBlurEffect && m_pOverlayBlurEffect->isEnabled())
-    //     m_pOverlayBlurEffect->setEnabled(false);
-
-    if (m_pOverlayLabel && m_pOverlayWidget)
-    {
-        if (m_fImageOverlay)
+
+    if (m_pOverlayLabel)
+    {
+        if (m_fOverlayMode)
         {
-
-            // QPainter painter(viewport());
-            // painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing | QPainter::SmoothPixmapTransform);
             QSize size(0.8 * width(), 0.8 * height());
             m_pOverlayLabel->setPixmap(m_overlayPixmap.scaled(size,  Qt::KeepAspectRatio, Qt::SmoothTransformation));
-            m_pOverlayWidget->move(0.1 * width(), 0.1 * height());
-            m_pOverlayWidget->show();
-            // QRect rect(10, 10, 0.4 * width() - 20, height() - 20);
-            // painter.drawPixmap(rect, m_overlayPixmap);
-            //painter.fillRect(rect, Qt::red);
+            int x = 0.5 * (width() - m_pOverlayLabel->width());
+            int y = 0.5 * (height() - m_pOverlayLabel->height());
+            m_pOverlayLabel->move(x, y);
+            m_pOverlayLabel->show();
         }
         else
-            m_pOverlayWidget->hide();
-
-    }
+            m_pOverlayLabel->hide();
+    }
+}
+
+bool UIHelpViewer::eventFilter(QObject *pObject, QEvent *pEvent)
+{
+    if (pObject == m_pOverlayLabel)
+    {
+        if (pEvent->type() == QEvent::MouseButtonPress ||
+            pEvent->type() == QEvent::MouseButtonDblClick)
+            clearOverlay();
+    }
+    return QIWithRetranslateUI<QTextBrowser>::eventFilter(pObject, pEvent);
 }
 
@@ -862 +873 @@
 void UIHelpViewer::clearOverlay()
 {
+    if (!m_fOverlayMode)
+        return;
     m_overlayPixmap = QPixmap();
-    m_fImageOverlay = false;
+    m_fOverlayMode = false;
     if (m_pOverlayBlurEffect)
         m_pOverlayBlurEffect->setEnabled(false);
+    emit sigOverlayModeChanged(false);
 }
 
@@ -895 +909 @@
         if (!m_overlayPixmap.isNull())
         {
-            m_fImageOverlay = true;
+            m_fOverlayMode = true;
             if (m_pOverlayBlurEffect)
                 m_pOverlayBlurEffect->setEnabled(true);
             viewport()->setCursor(m_defaultCursor);
+            emit sigOverlayModeChanged(true);
         }
     }

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

@@ -51 +51 @@
     void sigAddBookmark();
     void sigZoomPercentageChanged(int iPercentage);
+    void sigOverlayModeChanged(bool fEnabled);
 
 public:
@@ -72 +73 @@
     void setZoomPercentage(int iZoomPercentage);
     void setHelpFileList(const QList<QUrl> &helpFileList);
+    bool isInOverlayMode() const;
 
     static const QPair<int, int> zoomPercentageMinMax;
@@ -88 +90 @@
     virtual void mouseDoubleClickEvent(QMouseEvent *pEvent) /* override */;
     virtual void paintEvent(QPaintEvent *pEvent) /* override */;
+    virtual bool eventFilter(QObject *pObject, QEvent *pEvent) /* override */;
 
 private slots:
@@ -138 +141 @@
     QList<QUrl> m_helpFileList;
     QPixmap m_overlayPixmap;
-    bool m_fImageOverlay;
-
-    QWidget *m_pOverlayWidget;
+    bool m_fOverlayMode;
+    bool m_fCursorChanged;
     QLabel *m_pOverlayLabel;
     QGraphicsBlurEffect *m_pOverlayBlurEffect;
+
 };