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

Timestamp:

Jul 8, 2020 5:57:16 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515: A bit of cleanup for UIPasswordLineEdit which is embedded editor of UIUserNamePasswordEditor; Fixing look&feel for macOS first of all.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIUserNamePasswordEditor.cpp (modified) (3 diffs)
• UIUserNamePasswordEditor.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.cpp

@@ -20 +20 @@
 #include <QLabel>
 #include <QStyle>
-#include <QToolButton>
 #include <QVBoxLayout>
 
 /* GUI includes: */
 #include "QIRichTextLabel.h"
+#include "QIToolButton.h"
 #include "UICommon.h"
 #include "UIIconPool.h"
@@ -31 +31 @@
 
 UIPasswordLineEdit::UIPasswordLineEdit(QWidget *pParent /*= 0 */)
-    :QLineEdit(pParent)
+    : QLineEdit(pParent)
     , m_pTextVisibilityButton(0)
 {
@@ -39 +39 @@
 void UIPasswordLineEdit::toggleTextVisibility(bool fTextVisible)
 {
+    AssertPtrReturnVoid(m_pTextVisibilityButton);
+
     if (fTextVisible)
     {
         setEchoMode(QLineEdit::Normal);
-        if(m_pTextVisibilityButton)
+        if (m_pTextVisibilityButton)
             m_pTextVisibilityButton->setIcon(UIIconPool::iconSet(":/eye_closed_10px.png"));
-        return;
-    }
-    setEchoMode(QLineEdit::Password);
-    if(m_pTextVisibilityButton)
-        m_pTextVisibilityButton->setIcon(UIIconPool::iconSet(":/eye_10px.png"));
+    }
+    else
+    {
+        setEchoMode(QLineEdit::Password);
+        if (m_pTextVisibilityButton)
+            m_pTextVisibilityButton->setIcon(UIIconPool::iconSet(":/eye_10px.png"));
+    }
 }
 
 void UIPasswordLineEdit::prepare()
 {
-    m_pTextVisibilityButton = new QToolButton(this);
-    m_pTextVisibilityButton->setIconSize(QSize(10, 10));
-    m_pTextVisibilityButton->setFocusPolicy(Qt::ClickFocus);
-    m_pTextVisibilityButton->setAutoRaise(true);
-    m_pTextVisibilityButton->setCursor(Qt::ArrowCursor);
-    m_pTextVisibilityButton->show();
-    connect(m_pTextVisibilityButton, &QToolButton::clicked, this, &UIPasswordLineEdit::sltHandleTextVisibilityChange);
+    /* Prepare text visibility button: */
+    m_pTextVisibilityButton = new QIToolButton(this);
+    if (m_pTextVisibilityButton)
+    {
+        m_pTextVisibilityButton->setIconSize(QSize(10, 10));
+        m_pTextVisibilityButton->setFocusPolicy(Qt::ClickFocus);
+        m_pTextVisibilityButton->setCursor(Qt::ArrowCursor);
+        m_pTextVisibilityButton->show();
+        connect(m_pTextVisibilityButton, &QToolButton::clicked, this, &UIPasswordLineEdit::sltHandleTextVisibilityChange);
+    }
+
     toggleTextVisibility(false);
-}
-
-void UIPasswordLineEdit::paintEvent(QPaintEvent *pevent)
-{
-    QLineEdit::paintEvent(pevent);
+    adjustTextVisibilityButtonGeometry();
+}
+
+void UIPasswordLineEdit::adjustTextVisibilityButtonGeometry()
+{
+    AssertPtrReturnVoid(m_pTextVisibilityButton);
+
+#ifdef VBOX_WS_MAC
+    /* Do not forget to update QIToolButton size on macOS, it's FIXED: */
+    m_pTextVisibilityButton->setFixedSize(m_pTextVisibilityButton->minimumSizeHint());
+    /* Calculate suitable position for a QIToolButton, it's FRAMELESS: */
+    const int iWidth = m_pTextVisibilityButton->width();
+    const int iMinHeight = qMin(height(), m_pTextVisibilityButton->height());
+    const int iMaxHeight = qMax(height(), m_pTextVisibilityButton->height());
+    const int iHalfHeightDiff = (iMaxHeight - iMinHeight) / 2;
+    m_pTextVisibilityButton->setGeometry(width() - iWidth - iHalfHeightDiff, iHalfHeightDiff, iWidth, iWidth);
+#else
     int iFrameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
     int iSize = height() - 2 * iFrameWidth;
     m_pTextVisibilityButton->setGeometry(width() - iSize, iFrameWidth, iSize, iSize);
-
+#endif
+}
+
+void UIPasswordLineEdit::resizeEvent(QResizeEvent *pEvent)
+{
+    /* Call to base-class: */
+    QLineEdit::resizeEvent(pEvent);
+
+    adjustTextVisibilityButtonGeometry();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIUserNamePasswordEditor.h

@@ -32 +32 @@
 class QGridLayout;
 class QLabel;
+class QIToolButton;
 
 class UIPasswordLineEdit : public QLineEdit
@@ -48 +49 @@
 protected:
 
-    virtual void paintEvent(QPaintEvent *pevent) /* override */;
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
 
 private:
 
     void prepare();
+    void adjustTextVisibilityButtonGeometry();
 
-    QToolButton *m_pTextVisibilityButton;
+    QIToolButton *m_pTextVisibilityButton;
 
 private slots: