Changeset 88418 in vbox for trunk

Timestamp:

Apr 8, 2021 2:05:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Resizing images along side with font.

Location:

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

Files:

• UIHelpViewer.cpp (modified) (5 diffs)
• UIHelpViewer.h (modified) (3 diffs)

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

@@ -389 +389 @@
         m_pFindInPageWidget->clearSearchField();
     }
+    scaleImages();
 }
 
@@ -463 +464 @@
     m_iZoomPercentage = iZoomPercentage;
     scaleFont();
+    scaleImages();
     emit sigZoomPercentageChanged(m_iZoomPercentage);
 }
@@ -730 +732 @@
 void UIHelpViewer::iterateDocumentImages()
 {
-    m_imageSizesMap.clear();
+    m_imageMap.clear();
     QTextCursor cursor = textCursor();
     cursor.movePosition(QTextCursor::Start);
@@ -738 +740 @@
         if (cursor.charFormat().isImageFormat())
         {
+            DocumentImage image;
            QTextImageFormat imageFormat = cursor.charFormat().toImageFormat();
-           m_imageSizesMap[imageFormat.name()] = imageFormat.width();
+           image.m_fInitialWidth = imageFormat.width();
+           image.m_iPosition = cursor.position();
+           m_imageMap[imageFormat.name()] = image;
         }
     }
@@ -751 +756 @@
 }
 
+void UIHelpViewer::scaleImages()
+{
+    for (QMap<QString, DocumentImage>::iterator iterator = m_imageMap.begin();
+         iterator != m_imageMap.end(); ++iterator)
+    {
+        QTextCursor cursor = textCursor();
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::NextCharacter, QTextCursor::MoveAnchor, (*iterator).m_iPosition - 1);
+        if (cursor.isNull())
+            continue;
+        QTextCharFormat format = cursor.charFormat();
+        if (!format.isImageFormat())
+            continue;
+        QTextImageFormat imageFormat = format.toImageFormat();
+        imageFormat.setWidth((*iterator).m_fInitialWidth * m_iZoomPercentage / 100.);
+        cursor.deleteChar();
+        cursor.insertImage(imageFormat);
+    }
+}
+
+
 #include "UIHelpViewer.moc"
 

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

@@ -95 +95 @@
 private:
 
+    struct DocumentImage
+    {
+        qreal m_fInitialWidth;
+        int m_iPosition;
+    };
+
     void retranslateUi();
     bool isRectInside(const QRect &rect, int iMargin) const;
@@ -103 +109 @@
     void iterateDocumentImages();
     void scaleFont();
+    void scaleImages();
     const QHelpEngine* m_pHelpEngine;
     UIFindInPageWidget *m_pFindInPageWidget;
@@ -113 +120 @@
     int m_iSearchTermLength;
     int m_iInitialFontPointSize;
-    /** A container to store the original image sizes in the document. key is image name value is the width. */
-    QMap<QString, qreal> m_imageSizesMap;
+    /** A container to store the original image sizes/positions in the document. key is image name value is DocumentImage. */
+    QMap<QString, DocumentImage> m_imageMap;
     /** As percentage. */
     int m_iZoomPercentage;