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

Timestamp:

Jun 28, 2018 10:59:17 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: Small improvements to logviewer filter panel buttons

File:

• trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp (modified) (3 diffs)

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

@@ -79 +79 @@
     virtual void        mouseReleaseEvent(QMouseEvent *){}
     virtual void        paintEvent(QPaintEvent *event) /* override */;
+    virtual void        resizeEvent(QResizeEvent *event) /* override */;                                                                     
 
 private slots:
@@ -143 +144 @@
 }
 
-void UIVMFilterLineEdit::paintEvent(QPaintEvent *event)
-{
-    QLineEdit::paintEvent(event);
-
+void UIVMFilterLineEdit::resizeEvent(QResizeEvent *event)
+{
+    QLineEdit::resizeEvent(event);
+    
     if (!m_pClearAllButton || !m_pRemoveTermButton)
         createButtons();
     int clearButtonSize = height();
-
-    int deltaY = 0.5 * (height() - m_pClearAllButton->height());
-    m_pClearAllButton->setGeometry(width() - clearButtonSize, deltaY, clearButtonSize, clearButtonSize);
+    
+    int deltaHeight = 0.5 * (height() - m_pClearAllButton->height());
+    m_pClearAllButton->setGeometry(width() - clearButtonSize, deltaHeight, clearButtonSize, clearButtonSize);
+}
+
+void UIVMFilterLineEdit::paintEvent(QPaintEvent *event)
+{
+    QLineEdit::paintEvent(event);
+    int clearButtonSize = height();
     /* If we have a selected term move the m_pRemoveTermButton to the end of the
        or start of the word (depending on the location of the word within line edit itself: */
     if (hasSelectedText())
     {
+        int deltaHeight = 0.5 * (height() - m_pClearAllButton->height());        
         m_pRemoveTermButton->show();
-        int buttonY = 0.5 * (height() - 16);
         int buttonSize = m_iRemoveTermButtonSize;
         int charWidth = fontMetrics().width('x');
         int buttonLeft = cursorRect().right() - 0.5 * charWidth;
-        /* If buttonLeft is in far left of the line edit, move the
+        /* If buttonLeft is in far right of the line edit, move the
            button to left side of the selected word: */
         if (buttonLeft + buttonSize  >=  width() - clearButtonSize)
@@ -169 +176 @@
             buttonLeft -= (selectionWidth + buttonSize);
         }
-        m_pRemoveTermButton->setGeometry(buttonLeft, buttonY, buttonSize, buttonSize);
+        m_pRemoveTermButton->setGeometry(buttonLeft, deltaHeight, buttonSize, buttonSize);
     }
     else