Changeset 104575 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 10, 2024 1:35:32 PM (12 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163114

Message:

FE/Qt: bugref:10667: HiDPI fix for UIMarkableLineEdit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/extensions

Files:

• QILineEdit.cpp (modified) (2 diffs)
• QILineEdit.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp

@@ -207 +207 @@
 }
 
-
 void UIMarkableLineEdit::mark(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage)
 {
+    AssertPtrReturnVoid(m_pIconLabel);
     const QIcon icon = fError ? UIIconPool::iconSet(":/status_error_16px.png") : UIIconPool::iconSet(":/status_check_16px.png");
+    const int iIconMetric = qMin((int)(QApplication::style()->pixelMetric(QStyle::PM_SmallIconSize) * .625), height());
+    const qreal fDevicePixelRatio = gpDesktop->devicePixelRatio(m_pIconLabel);
     const QString strToolTip = fError ? strErrorMessage : strNoErrorMessage;
-    const int iIconMetric = QApplication::style()->pixelMetric(QStyle::PM_LargeIconSize);
-    const qreal fDevicePixelRatio = gpDesktop->devicePixelRatio(m_pIconLabel);
-    QPixmap iconPixmap = icon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio);
-    m_iIconMargin = QApplication::style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    int iHeight = height() -  m_iIconMargin;
-    iconPixmap = iconPixmap.scaledToHeight(iHeight, Qt::SmoothTransformation);
+    const QPixmap iconPixmap = icon.pixmap(QSize(iIconMetric, iIconMetric), fDevicePixelRatio);
     m_pIconLabel->setPixmap(iconPixmap);
+    m_pIconLabel->resize(m_pIconLabel->minimumSizeHint());
     m_pIconLabel->setToolTip(strToolTip);
-
+    m_iIconMargin = (height() - m_pIconLabel->height()) / 2;
     update();
 }
 
-void UIMarkableLineEdit::paintEvent(QPaintEvent *pEvent)
-{
-    QLineEdit::paintEvent(pEvent);
-    moveIconLabel();
-}
 void UIMarkableLineEdit::moveIconLabel()
 {
     AssertPtrReturnVoid(m_pIconLabel);
-    m_pIconLabel->setVisible(true);
-    int iHeight = height() -  m_iIconMargin;
-    m_pIconLabel->setGeometry(width() - iHeight - 0.5 * m_iIconMargin, 0.5 * m_iIconMargin, iHeight, iHeight);
+    m_pIconLabel->move(width() - m_pIconLabel->width() - m_iIconMargin, m_iIconMargin);
 }
 
@@ -241 +232 @@
     /* Call to base-class: */
     QLineEdit::resizeEvent(pResizeEvent);
+    moveIconLabel();
+}
+
+void UIMarkableLineEdit::showEvent(QShowEvent *pShowEvent)
+{
+    /* Call to base-class: */
+    QLineEdit::showEvent(pShowEvent);
     moveIconLabel();
 }

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h

@@ -118 +118 @@
 
     /** Handles resize @a pEvent. */
-    virtual void resizeEvent(QResizeEvent *pResizeEvent) RT_OVERRIDE;
-    virtual void paintEvent(QPaintEvent *pEvent) RT_OVERRIDE;
+    virtual void resizeEvent(QResizeEvent *pEvent) RT_OVERRIDE;
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
     void moveIconLabel();
     void prepare();