儲存庫 vbox 的更動 101441

時間撮記:

2023-10-13 下午03:57:41 (17 月 以前)

作者:

vboxsync

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

159500

訊息:

FE/Qt: bugref:10513: UIAdvancedSettingsDialog: Fixes for filter button layout; Especially on macOS.

檔案:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp (修改) (5 筆差異)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UIAdvancedSettingsDialog.cpp

@@ -44 +44 @@
 #include <QStackedWidget>
 #include <QTimer>
+#include <QToolButton>
 #include <QVariant>
 #include <QVBoxLayout>
@@ -50 +51 @@
 #include "QIDialogButtonBox.h"
 #include "QILineEdit.h"
-#include "QIToolButton.h"
 #include "UIAdvancedSettingsDialog.h"
 #include "UIAnimationFramework.h"
@@ -182 +182 @@
 
     /** Holds the filter editor instance. */
-    QILineEdit   *m_pLineEdit;
+    QILineEdit  *m_pLineEdit;
     /** Holds the filter reset button instance. */
-    QIToolButton *m_pToolButton;
+    QToolButton *m_pToolButton;
 
     /** Holds whether filter editor focused. */
@@ -432 +432 @@
 
     /* Prepare filter reset button: */
-    m_pToolButton = new QIToolButton(this);
+    m_pToolButton = new QToolButton(this);
     if (m_pToolButton)
     {
+#ifdef VBOX_WS_MAC
+        setStyleSheet("QToolButton { border: 0px none black; margin: 0px 0px 0px 0px; } QToolButton::menu-indicator {image: none;}");
+#endif
         m_pToolButton->hide();
         m_pToolButton->setIconSize(QSize(10, 10));
         m_pToolButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
-        connect(m_pToolButton, &QIToolButton::clicked,
+        connect(m_pToolButton, &QToolButton::clicked,
                 this, &UIFilterEditor::sltHandleButtonClicked);
     }
@@ -481 +484 @@
                        ? (iMinimumEditorHeight - iMinimumButtonHeight) / 2
                        : 0;
-    m_pToolButton->setGeometry(iWidth - iMinimumButtonWidth, iButtonY, iMinimumButtonWidth, iMinimumButtonHeight);
+    m_pToolButton->setGeometry(iWidth - iMinimumButtonWidth - 1, iButtonY, iMinimumButtonWidth, iMinimumButtonHeight);
 }