Changeset 106651 in vbox

Timestamp:

Oct 24, 2024 10:57:35 AM (3 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9072. Apply correct margin to to bottom/up buttons as the text edit content changes.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerTextEdit.cpp (modified) (1 diff)
• UIVMLogViewerTextEdit.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp

@@ -493 +493 @@
         m_pLineNumberArea->setGeometry(QRect(cr.left(), cr.top(), lineNumberAreaWidth(), cr.height()));
     }
-
-   if (m_pScrollToBottomLabel && m_pScrollToTopLabel)
-   {
-       QScrollBar *pVScrollBar = verticalScrollBar();
-       QScrollBar *pHScrollBar = horizontalScrollBar();
-
-       int iMarginX = 0;
-       if (pVScrollBar)
-           iMarginX = pVScrollBar->width();
-       if (iMarginX == 0)
-           iMarginX = m_pScrollToBottomLabel->width();
-       iMarginX += 2 * QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin);
-       int iMarginY = 0;
-       if (pHScrollBar)
-           iMarginY = pHScrollBar->height();
-       if (iMarginY == 0)
-           iMarginY = m_pScrollToTopLabel->height();
-
-
-       m_pScrollToBottomLabel->move(width() - iMarginX - m_pScrollToBottomLabel->width(),
+    repositionToBottomToUpButtons();
+}
+
+void UIVMLogViewerTextEdit::repositionToBottomToUpButtons()
+{
+    if (m_pScrollToBottomLabel && m_pScrollToTopLabel)
+    {
+        QScrollBar *pVScrollBar = verticalScrollBar();
+        QScrollBar *pHScrollBar = horizontalScrollBar();
+        QSize iconSize = m_pScrollToBottomLabel->pixmap().size();
+        int iMarginX = 0;
+        if (pVScrollBar)
+            iMarginX = pVScrollBar->width();
+        if (iMarginX == 0)
+            iMarginX = iconSize.width();
+        iMarginX += 2 * QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin);
+        int iMarginY = 0;
+        if (pHScrollBar)
+            iMarginY = pHScrollBar->height();
+        if (iMarginY == 0)
+            iMarginY = iconSize.height();
+
+         m_pScrollToBottomLabel->move(width() - iMarginX - iconSize.width(),
                                      0.5 * m_pScrollToBottomLabel->height());
 
-       m_pScrollToTopLabel->move(width() - iMarginX - m_pScrollToTopLabel->width(),
-                                  height() - iMarginY - 1.5 * m_pScrollToTopLabel->height());
-   }
+        m_pScrollToTopLabel->move(width() - iMarginX - iconSize.width(),
+                                  height() - iMarginY - 1.5 * iconSize.height());
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.h

@@ -113 +113 @@
     /** If bookmark exists this function removes it, if not it adds the bookmark. */
     void toggleBookmark(const UIVMLogBookmark& bookmark);
+    void repositionToBottomToUpButtons();
 
     UIVMLogBookmark  m_iContextMenuBookmark;