Changeset 88496 in vbox for trunk/src

Timestamp:

Apr 13, 2021 4:56:17 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Drawing another layer of images on top of the document since QTextBrowser renders them in a very poor quality

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (1 diff)
• UIHelpViewer.cpp (modified) (6 diffs)
• UIHelpViewer.h (modified) (1 diff)

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

@@ -927 +927 @@
     else
         addNewTab(url, false);
-
     updateTabUrlTitleList();
 }

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

@@ -489 +489 @@
 {
     m_helpFileList = helpFileList;
+    /* File list necessary to get the image data from the help engine: */
+    iterateDocumentImages();
+    scaleImages();
 }
 
@@ -580 +583 @@
     else if (pEvent->modifiers() & Qt::ControlModifier)
     {
-        if (pEvent->angleDelta().y() < 0)
+        if (pEvent->angleDelta().y() > 0)
             zoom(ZoomOperation_In);
-        else if (pEvent->angleDelta().y() > 0)
+        else if (pEvent->angleDelta().y() < 0)
             zoom(ZoomOperation_Out);
     }
@@ -644 +647 @@
 {
     QIWithRetranslateUI<QTextBrowser>::paintEvent(pEvent);
-
-
+    QPainter painter(viewport());
+    foreach(const DocumentImage &image, m_imageMap)
+    {
+        QRect rect = cursorRect(image.m_textCursor);
+        QPixmap newPixmap = image.m_pixmap.scaledToWidth(image.m_fScaledWidth, Qt::SmoothTransformation);
+        QRectF imageRect(rect.x() - newPixmap.width(), rect.y(), newPixmap.width(), newPixmap.height());
+
+        int iMargin = 3;
+        QRectF fillRect(imageRect.x() - iMargin, imageRect.y() - iMargin,
+                        imageRect.width() + 2 * iMargin, imageRect.height() + 2 * iMargin);
+
+        painter.fillRect(fillRect, Qt::white);
+        painter.drawPixmap(imageRect, newPixmap, newPixmap.rect());
+     }
     // if (m_pOverlayLabel)
     // {
@@ -875 +890 @@
             DocumentImage &image = iterator.value();
             image.m_fInitialWidth = imageFormat.width();
-            //image.m_iPosition = cursor.position();
+            image.m_strName = imageFormat.name();
             image.m_textCursor = cursor;
             QUrl imageFileUrl;
@@ -905 +920 @@
 void UIHelpViewer::scaleImages()
 {
-    // for (QHash<QString, DocumentImage>::iterator iterator = m_imageMap.begin();
-    //      iterator != m_imageMap.end(); ++iterator)
-    foreach(const DocumentImage &image, m_imageMap)
-    {
-
-        // QTextCursor cursor = textCursor();
-        // cursor.movePosition(QTextCursor::Start);
-        // cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, image.m_iPosition);
-        // if (cursor.isNull())
-        //     continue;
+    for (QHash<QString, DocumentImage>::iterator iterator = m_imageMap.begin();
+         iterator != m_imageMap.end(); ++iterator)
+    {
+        DocumentImage &image = *iterator;
         QTextCursor cursor = image.m_textCursor;
         QTextCharFormat format = cursor.charFormat();
@@ -920 +929 @@
             continue;
         QTextImageFormat imageFormat = format.toImageFormat();
-        imageFormat.setWidth(image.m_fInitialWidth * m_iZoomPercentage / 100.);
+        image.m_fScaledWidth = image.m_fInitialWidth * m_iZoomPercentage / 100.;
+        imageFormat.setWidth(image.m_fScaledWidth);
         cursor.deletePreviousChar();
         cursor.deleteChar();

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

@@ -109 +109 @@
     {
         qreal m_fInitialWidth;
+        qreal m_fScaledWidth;
         //int m_iPosition;
         QTextCursor m_textCursor;
         QPixmap m_pixmap;
+        QString m_strName;
     };