Changeset 104979 in vbox

Timestamp:

Jun 20, 2024 1:19:45 PM (9 months ago)

Author:

vboxsync

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

163589

Message:

FE/Qt: bugref:10666, bugref:10669: Another part of cleanup for QILineEdit; This is the 2nd step, renaming, wiping unused stuff, adding comments.

Location:

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

Files:

• QILineEdit.cpp (modified) (11 diffs)
• QILineEdit.h (modified) (3 diffs)

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

@@ -30 +30 @@
 #include <QClipboard>
 #include <QContextMenuEvent>
-#include <QHBoxLayout>
 #include <QLabel>
 #include <QMenu>
@@ -39 +38 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIIconPool.h"
-
-/* Other VBox includes: */
-#include "iprt/assert.h"
 
 
@@ -50 +46 @@
     , m_fMarkable(false)
     , m_fMarkForError(false)
-    , m_pIconLabel(0)
+    , m_pLabelIcon(0)
     , m_iIconMargin(0)
 {
@@ -62 +58 @@
     , m_fMarkable(false)
     , m_fMarkForError(false)
-    , m_pIconLabel(0)
+    , m_pLabelIcon(0)
     , m_iIconMargin(0)
 {
@@ -85 +81 @@
 void QILineEdit::setMarkable(bool fMarkable)
 {
+    /* Sanity check: */
     if (m_fMarkable == fMarkable)
         return;
+
+    /* Save new value, show/hide label accordingly: */
     m_fMarkable = fMarkable;
     update();
@@ -93 +92 @@
 void QILineEdit::mark(bool fError, const QString &strErrorMessage, const QString &strNoErrorMessage)
 {
-    AssertPtrReturnVoid(m_pIconLabel);
-    if (!m_fMarkable)
+    /* Sanity check: */
+    if (   !m_pLabelIcon
+        || !m_fMarkable)
         return;
 
+    /* Assign corresponding icon: */
     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 qreal fDevicePixelRatio = gpDesktop->devicePixelRatio(m_pLabelIcon);
     const QString strToolTip = fError ? strErrorMessage : strNoErrorMessage;
     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;
+    m_pLabelIcon->setPixmap(iconPixmap);
+    m_pLabelIcon->resize(m_pLabelIcon->minimumSizeHint());
+    m_pLabelIcon->setToolTip(strToolTip);
+    m_iIconMargin = (height() - m_pLabelIcon->height()) / 2;
     update();
 }
@@ -111 +112 @@
 bool QILineEdit::event(QEvent *pEvent)
 {
+    /* Depending on event type: */
     switch (pEvent->type())
     {
@@ -131 +133 @@
             break;
     }
+
+    /* Call to base-class: */
     return QLineEdit::event(pEvent);
 }
@@ -140 +144 @@
     if (m_fMarkable)
     {
-        m_pIconLabel->resize(m_pIconLabel->minimumSizeHint());
-        m_iIconMargin = (height() - m_pIconLabel->height()) / 2;
+        m_pLabelIcon->resize(m_pLabelIcon->minimumSizeHint());
+        m_iIconMargin = (height() - m_pLabelIcon->height()) / 2;
         moveIconLabel();
     }
@@ -174 +178 @@
 
     /* Prepare icon label: */
-    m_pIconLabel = new QLabel(this);
+    m_pLabelIcon = new QLabel(this);
 }
 
@@ -199 +203 @@
 void QILineEdit::moveIconLabel()
 {
-    AssertPtrReturnVoid(m_pIconLabel);
-    m_pIconLabel->move(width() - m_pIconLabel->width() - m_iIconMargin, m_iIconMargin);
-}
+    /* Sanity check: */
+    if (   !m_pLabelIcon
+        || !m_fMarkable)
+        return;
+
+    /* We do it cause we have manual layout for the label: */
+    m_pLabelIcon->move(width() - m_pLabelIcon->width() - m_iIconMargin, m_iIconMargin);
+}

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

@@ -33 +33 @@
 
 /* Qt includes */
-#include <QIcon>
 #include <QLineEdit>
 
@@ -39 +38 @@
 #include "UILibraryDefs.h"
 
+/* Forward declarations: */
 class QLabel;
 
@@ -104 +104 @@
     bool     m_fMarkForError;
     /** Holds the icon label instance. */
-    QLabel  *m_pIconLabel;
+    QLabel  *m_pLabelIcon;
     /** Holds last error message. */
     QString  m_strErrorMessage;