Changeset 108202 in vbox

Timestamp:

Feb 13, 2025 4:12:22 PM (3 months ago)

Author:

vboxsync

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

167520

Message:

FE/Qt: bugref:10814: VBox Manager / Tools pane: Pass popup flag deeper into the view.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools

Files:

• UITools.cpp (modified) (1 diff)
• UIToolsView.cpp (modified) (4 diffs)
• UIToolsView.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp

@@ -129 +129 @@
 
     /* Prepare view: */
-    m_pToolsView = new UIToolsView(this);
+    m_pToolsView = new UIToolsView(this, isPopup());
     if (m_pToolsView)
     {

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp

@@ -115 +115 @@
 
 
-UIToolsView::UIToolsView(UITools *pParent)
+UIToolsView::UIToolsView(UITools *pParent, bool fPopup)
     : QIGraphicsView(pParent)
     , m_pTools(pParent)
+    , m_fPopup(fPopup)
     , m_iMinimumWidthHint(0)
     , m_iMinimumHeightHint(0)
@@ -168 +169 @@
 
     /* No minimum size-hint for widget mode: */
-    if (!tools()->isPopup())
+    if (!isPopup())
         setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
 
@@ -202 +203 @@
     QColor backgroundColorActive = pal.color(QPalette::Active, QPalette::Window);
     QColor backgroundColorInactive = pal.color(QPalette::Inactive, QPalette::Window);
-    if (!tools()->isPopup())
+    if (!isPopup())
     {
         backgroundColorActive = uiCommon().isInDarkMode()
@@ -216 +217 @@
 #else /* !VBOX_WS_MAC */
 
-    if (tools()->isPopup())
+    if (isPopup())
     {
         /* Same as on macOS for now, will go away soon: */
         QColor backgroundColorActive = pal.color(QPalette::Active, QPalette::Window);
         QColor backgroundColorInactive = pal.color(QPalette::Inactive, QPalette::Window);
-        if (!tools()->isPopup())
+        if (!isPopup())
         {
             backgroundColorActive = uiCommon().isInDarkMode()

trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.h

@@ -51 +51 @@
 
     /** Constructs a Tools-view passing @a pParent to the base-class.
-      * @param  pParent  Brings the Tools-container to embed into. */
-    UIToolsView(UITools *pParent);
+      * @param  pParent  Brings the Tools-container to embed into.
+      * @param  fPopup   Brings whether tools represented as popup. */
+    UIToolsView(UITools *pParent, bool fPopup);
 
     /** @name General stuff.
@@ -98 +99 @@
     /** @name General stuff.
       * @{ */
+        /** Returns whether tools represented as popup. */
+        bool isPopup() const { return m_fPopup; }
+
         /** Updates scene rectangle. */
         void updateSceneRect();
@@ -111 +115 @@
         /** Holds the Tools-pane reference. */
         UITools *m_pTools;
+
+        /** Holds whether tools represented as popup. */
+        const bool  m_fPopup;
     /** @} */