Changeset 52649 in vbox for trunk

Timestamp:

Sep 8, 2014 6:51:05 PM (11 years ago)

Author:

vboxsync

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

95954

Message:

FE/Qt: 3646: Runtime UI: Status-bar editor: Use more generic way of painting check-box control for hovered indicator switch.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIStatusBarEditorWindow.cpp

@@ -206 +206 @@
     const QIcon icon = gpConverter->toIcon(m_type);
     /* Cache button size-hint: */
-    m_size = icon.availableSizes().first();
+    QStyleOptionButton option;
+    option.initFrom(this);
+    const QRect minRect = QApplication::style()->subElementRect(QStyle::SE_CheckBoxIndicator, &option);
+    m_size = icon.availableSizes().first().expandedTo(minRect.size());
     /* Cache pixmap of same size: */
     m_pixmap = icon.pixmap(m_size);
@@ -233 +236 @@
     /* Create style-painter: */
     QStylePainter painter(this);
-    QStyleOption option;
+    /* Prepare option set for check-box: */
+    QStyleOptionButton option;
     option.initFrom(this);
+    /* Use the size of 'this': */
     option.rect = QRect(0, 0, width(), height());
+    /* But do not use hover bit of 'this' since
+     * we already have another hovered-state representation: */
+    if (option.state & QStyle::State_MouseOver)
+        option.state &= ~QStyle::State_MouseOver;
     /* Remember checked-state: */
     if (m_fChecked)
@@ -241 +250 @@
     /* Draw check-box for hovered-state: */
     if (m_fHovered)
-        painter.drawPrimitive(QStyle::PE_IndicatorCheckBox, option);
+        painter.drawControl(QStyle::CE_CheckBox, option);
     /* Draw pixmap for unhovered-state: */
     else