Changeset 104980 in vbox

Timestamp:

Jun 20, 2024 1:21:58 PM (9 months ago)

Author:

vboxsync

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

163590

Message:

FE/Qt: bugref:10666, bugref:10669: QILineEdit: Merge resizeEvent and showEvent into event function; Throw out some excessive code.

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

@@ -130 +130 @@
             break;
         }
+        case QEvent::Move:
+        case QEvent::Resize:
+        {
+            /* Update label position on each move/resize: */
+            if (m_fMarkable)
+                moveIconLabel();
+            break;
+        }
         default:
             break;
@@ -136 +144 @@
     /* Call to base-class: */
     return QLineEdit::event(pEvent);
-}
-
-void QILineEdit::resizeEvent(QResizeEvent *pResizeEvent)
-{
-    /* Call to base-class: */
-    QLineEdit::resizeEvent(pResizeEvent);
-    if (m_fMarkable)
-    {
-        m_pLabelIcon->resize(m_pLabelIcon->minimumSizeHint());
-        m_iIconMargin = (height() - m_pLabelIcon->height()) / 2;
-        moveIconLabel();
-    }
-}
-
-void QILineEdit::showEvent(QShowEvent *pShowEvent)
-{
-    /* Call to base-class: */
-    QLineEdit::showEvent(pShowEvent);
-    if (m_fMarkable)
-        moveIconLabel();
 }
 

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

@@ -72 +72 @@
     virtual bool event(QEvent *pEvent) RT_OVERRIDE;
 
-    /** Handles resize @a pEvent. */
-    virtual void resizeEvent(QResizeEvent *pResizeEvent) RT_OVERRIDE;
-
-    /** Handles show @a pEvent. */
-    virtual void showEvent(QShowEvent *pEvent) RT_OVERRIDE;
-
 private slots: