Changeset 88660 in vbox for trunk/src/VBox

Timestamp:

Apr 22, 2021 4:24:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930: A bit of fixes for r143972; Making that menu separate top-level popup widget, it doesn't need to be togglable, just should not disappear on any of check-boxes click; No need to to calculate/limit size manually, just use the one layout knows about.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogViewerWidget.cpp (modified) (5 diffs)
• UIVMLogViewerWidget.h (modified) (2 diffs)

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

@@ -105 +105 @@
 
 UIMachineListMenu::UIMachineListMenu(QWidget *pParent /* = 0 */)
-    :QWidget(pParent)
+    :QWidget(pParent, Qt::Popup)
     , m_pLayout(0)
 {
     m_pLayout = new QVBoxLayout(this);
+    if (m_pLayout)
+    {
+        /* Configure layout: */
+        const int iL = qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin) / 2;
+        const int iT = qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin) / 2;
+        const int iR = qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin) / 2;
+        const int iB = qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) / 2;
+        m_pLayout->setContentsMargins(iL, iT, iR, iB);
+    }
 }
 
@@ -123 +132 @@
     pCheckBox->setId(id);
     m_pLayout->addWidget(pCheckBox);
-    computeMinimumSize();
-}
-
-void UIMachineListMenu::computeMinimumSize()
-{
-    int iMaxTextLen = 0;
-    foreach(const UIMachineListCheckBox *pCheckBox, m_checkboxes)
-    {
-        if (!pCheckBox)
-            continue;
-        //iMaxTextLen = qMax(iMaxTextLen, fontMetrics().horizontalAdvance(pCheckBox->text()));
-        iMaxTextLen = qMax(iMaxTextLen, pCheckBox->width());
-    }
-    int iWidth = iMaxTextLen + 2 * qApp->style()->pixelMetric(QStyle::PM_ButtonIconSize);
-    int iHeight = m_checkboxes.size() * fontMetrics().height() +
-        qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) +
-        qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin);
-    //printf("%d %d\n", iWidth, iHeight);
-    setMinimumSize(iWidth, iHeight);
-    update();
 }
 
@@ -242 +231 @@
 }
 
-void UIVMLogViewerWidget::resizeEvent(QResizeEvent *pEvent)
-{
-    QIWithRetranslateUI<QWidget>::resizeEvent(pEvent);
-    if (m_pMachineSelectionMenu)
-        m_pMachineSelectionMenu->move(0, 40);
-}
-
 void UIVMLogViewerWidget::sltSaveOptions()
 {
@@ -551 +533 @@
 }
 
-void UIVMLogViewerWidget::sltCornerButtonToggled(bool fToggle)
-{
-    if (m_pMachineSelectionMenu)
-        m_pMachineSelectionMenu->setVisible(fToggle);
+void UIVMLogViewerWidget::sltCornerButtonClicked()
+{
+    if (m_pMachineSelectionMenu && m_pCornerButton)
+    {
+        m_pMachineSelectionMenu->adjustSize();
+        m_pMachineSelectionMenu->move(m_pCornerButton->mapToGlobal(QPoint(-m_pMachineSelectionMenu->width(), 0)));
+        m_pMachineSelectionMenu->show();
+    }
 }
 
@@ -630 +616 @@
             {
                 m_pTabWidget->setCornerWidget(m_pCornerButton);//, Qt::TopLeftCorner);
-                m_pCornerButton->setCheckable(true);
                 m_pCornerButton->setIcon(UIIconPool::iconSet(":/machine_16px.png"));
-                m_pCornerButton->setCheckable(true);
                 m_pMachineSelectionMenu = new UIMachineListMenu(this);
-                m_pMachineSelectionMenu->setAutoFillBackground(true);
-                m_pMachineSelectionMenu->setVisible(false);
-                connect(m_pCornerButton, &QIToolButton::toggled, this, &UIVMLogViewerWidget::sltCornerButtonToggled);
-                //m_pCornerButton->setMenu(m_pMachineSelectionMenu);
-                //m_pCornerButton->setPopupMode(QToolButton::InstantPopup);
+                connect(m_pCornerButton, &QIToolButton::clicked, this, &UIVMLogViewerWidget::sltCornerButtonClicked);
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -93 +93 @@
     /** Returns whether the window should be maximized when geometry being restored. */
     virtual bool shouldBeMaximized() const /* override */;
-    void resizeEvent(QResizeEvent *pEvent) /* override */;
 
 private slots:
@@ -140 +139 @@
         void sltResetOptionsToDefault();
     /** @} */
-    void sltCornerButtonToggled(bool fToggle);
+    void sltCornerButtonClicked();
 private:
         struct Machine