Changeset 75106 in vbox

Timestamp:

Oct 26, 2018 3:34:50 PM (6 years ago)

Author:

vboxsync

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

126169

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Do not draw border around tool button until it's hovered.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItemGlobal.cpp (modified) (3 diffs)
• UIChooserItemGlobal.h (modified) (1 diff)
• UIChooserItemMachine.cpp (modified) (3 diffs)
• UIChooserItemMachine.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp

@@ -130 +130 @@
 }
 
-bool UIChooserItemGlobal::isToolsButtonArea(const QPoint &position) const
+bool UIChooserItemGlobal::isToolsButtonArea(const QPoint &position, int iMarginMultiplier /* = 1 */) const
 {
     const int iFullWidth = geometry().width();
@@ -142 +142 @@
                        m_toolsPixmap.width() / m_toolsPixmap.devicePixelRatio(),
                        m_toolsPixmap.height() / m_toolsPixmap.devicePixelRatio());
-    rect.adjust(- iButtonMargin, -iButtonMargin, iButtonMargin, iButtonMargin);
+    rect.adjust(-iMarginMultiplier * iButtonMargin, -iMarginMultiplier * iButtonMargin,
+                 iMarginMultiplier * iButtonMargin,  iMarginMultiplier * iButtonMargin);
     return rect.contains(position);
 }
@@ -803 +804 @@
 
         /* Paint flat button: */
-        paintFlatButton(/* Painter: */
-                        pPainter,
-                        /* Button rectangle: */
-                        buttonRectangle,
-                        /* Cursor position: */
-                        itemCursorPosition);
+        if (   isHovered()
+            && isToolsButtonArea(itemCursorPosition, 4))
+            paintFlatButton(/* Painter: */
+                            pPainter,
+                            /* Button rectangle: */
+                            buttonRectangle,
+                            /* Cursor position: */
+                            itemCursorPosition);
 
         /* Paint pixmap: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.h

@@ -49 +49 @@
       * @{ */
         /** Returns whether passed @a position belongs to tools button area. */
-        bool isToolsButtonArea(const QPoint &position) const;
+        bool isToolsButtonArea(const QPoint &position, int iMarginMultiplier = 1) const;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp

@@ -163 +163 @@
 }
 
-bool UIChooserItemMachine::isToolsButtonArea(const QPoint &position) const
+bool UIChooserItemMachine::isToolsButtonArea(const QPoint &position, int iMarginMultiplier /* = 1 */) const
 {
     const int iFullWidth = geometry().width();
@@ -175 +175 @@
                        m_toolsPixmap.width() / m_toolsPixmap.devicePixelRatio(),
                        m_toolsPixmap.height() / m_toolsPixmap.devicePixelRatio());
-    rect.adjust(- iButtonMargin, -iButtonMargin, iButtonMargin, iButtonMargin);
+    rect.adjust(-iMarginMultiplier * iButtonMargin, -iMarginMultiplier * iButtonMargin,
+                 iMarginMultiplier * iButtonMargin,  iMarginMultiplier * iButtonMargin);
     return rect.contains(position);
 }
@@ -1264 +1265 @@
 
         /* Paint flat button: */
-        paintFlatButton(/* Painter: */
-                        pPainter,
-                        /* Button rectangle: */
-                        buttonRectangle,
-                        /* Cursor position: */
-                        itemCursorPosition);
+        if (   isHovered()
+            && isToolsButtonArea(itemCursorPosition, 4))
+            paintFlatButton(/* Painter: */
+                            pPainter,
+                            /* Button rectangle: */
+                            buttonRectangle,
+                            /* Cursor position: */
+                            itemCursorPosition);
 
         /* Paint pixmap: */

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.h

@@ -62 +62 @@
 
         /** Returns whether passed @a position belongs to tools button area. */
-        bool isToolsButtonArea(const QPoint &position) const;
+        bool isToolsButtonArea(const QPoint &position, int iMarginMultiplier = 1) const;
     /** @} */