Kill unnecessary SystemPalette instances

Each SystemPalette instance installs an event filter on the
application object, so we should try to avoid these as much as
possible. Style already creates an instance that switches between
Active and Disabled states based on control's enabled state and is
suitable for most use cases.

Change-Id: Icdbc793f639a3217ece6b2ded281e2a8beacb742
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

14 files changed, 5 insertions, 74 deletions

diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml
index d0299a55..98336964 100644
--- a/src/controls/Styles/Base/ButtonStyle.qml
+++ b/src/controls/Styles/Base/ButtonStyle.qml
@@ -79,12 +79,6 @@ Style {
     /*! The \l {QtQuick.Controls::}{Button} attached to this style. */
     readonly property Button control: __control
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
-
     /*! The padding between the background and the label components. */
     padding {
         top: 4
diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml
index 2dcaa9e9..36eeb78f 100644
--- a/src/controls/Styles/Base/CheckBoxStyle.qml
+++ b/src/controls/Styles/Base/CheckBoxStyle.qml
@@ -78,11 +78,6 @@ Style {
 
     /*! The \l CheckBox attached to this style. */
     readonly property CheckBox control: __control
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
 
     /*! This defines the text label. */
     property Component label: Item {
diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml
index eed7e7f4..6bf8a391 100644
--- a/src/controls/Styles/Base/ComboBoxStyle.qml
+++ b/src/controls/Styles/Base/ComboBoxStyle.qml
@@ -69,11 +69,7 @@ Style {
         \sa Text::renderType
     */
     property int renderType: Text.NativeRendering
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
+
     /*! The \l ComboBox attached to this style. */
     readonly property ComboBox control: __control
 
diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml
index af8d41b6..e001fb26 100644
--- a/src/controls/Styles/Base/GroupBoxStyle.qml
+++ b/src/controls/Styles/Base/GroupBoxStyle.qml
@@ -50,11 +50,6 @@ import QtQuick.Controls.Private 1.0
 */
 Style {
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     /*! The \l GroupBox attached to this style. */
     readonly property GroupBox control: __control
 
diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml
index 8ab758f5..5c566b3a 100644
--- a/src/controls/Styles/Base/MenuBarStyle.qml
+++ b/src/controls/Styles/Base/MenuBarStyle.qml
@@ -100,14 +100,12 @@ Style {
         implicitHeight: text.height + 4
         color: styleData.open ? "#49d" : "transparent"
 
-        SystemPalette { id: syspal }
-
         Text {
             id: text
             text: formatMnemonic(styleData.text, styleData.underlineMnemonic)
             anchors.centerIn: parent
             renderType: Text.NativeRendering
-            color: styleData.open ? "white" : syspal.windowText
+            color: styleData.open ? "white" : __syspal.windowText
         }
     }
 
diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml
index 0a98beef..ec379884 100644
--- a/src/controls/Styles/Base/ProgressBarStyle.qml
+++ b/src/controls/Styles/Base/ProgressBarStyle.qml
@@ -111,11 +111,6 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: progressBarStyle
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     /*! The \l ProgressBar attached to this style. */
     readonly property ProgressBar control: __control
 
diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml
index 0f242eb0..bedd3dca 100644
--- a/src/controls/Styles/Base/RadioButtonStyle.qml
+++ b/src/controls/Styles/Base/RadioButtonStyle.qml
@@ -75,11 +75,6 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: radiobuttonStyle
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     /*! The \l RadioButton attached to this style. */
     readonly property RadioButton control: __control
 
diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
index d072f82e..8c17e35a 100644
--- a/src/controls/Styles/Base/ScrollViewStyle.qml
+++ b/src/controls/Styles/Base/ScrollViewStyle.qml
@@ -51,11 +51,6 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: root
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     /*! The \l ScrollView attached to this style. */
     readonly property ScrollView control: __control
 
diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml
index d5109089..1e2750fb 100644
--- a/src/controls/Styles/Base/SliderStyle.qml
+++ b/src/controls/Styles/Base/SliderStyle.qml
@@ -82,11 +82,6 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: styleitem
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     /*! The \l Slider attached to this style. */
     readonly property Slider control: __control
 
diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml
index caa20abd..c9df4471 100644
--- a/src/controls/Styles/Base/SpinBoxStyle.qml
+++ b/src/controls/Styles/Base/SpinBoxStyle.qml
@@ -69,12 +69,6 @@ Style {
     /*! The \l SpinBox attached to this style. */
     readonly property SpinBox control: __control
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
-
     /*! The content margins of the text field. */
     padding { top: 1 ; left: Math.round(styleData.contentHeight/2) ; right: Math.max(22, Math.round(styleData.contentHeight)) ; bottom: 0 }
     /*! \qmlproperty enumeration horizontalAlignment
diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml
index d999551c..a0bed38d 100644
--- a/src/controls/Styles/Base/TextFieldStyle.qml
+++ b/src/controls/Styles/Base/TextFieldStyle.qml
@@ -68,11 +68,6 @@ import QtQuick.Controls.Private 1.0
 Style {
     id: style
 
-    /*! \internal */
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     /*! The \l TextField attached to this style. */
     readonly property TextField control: __control
 
diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml
index ba897bfb..7896c234 100644
--- a/src/controls/Styles/Desktop/SpinBoxStyle.qml
+++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml
@@ -44,11 +44,6 @@ import QtQuick.Controls.Private 1.0
 Style {
     readonly property SpinBox control: __control
 
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
-
     padding {
        top: control.__panel ? control.__panel.topPadding + (styleitem.style === "mac" ? 2 : 0) : 0
        left: control.__panel ? control.__panel.leftPadding : 0
diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml
index 5ad1f394..60589e5e 100644
--- a/src/controls/Styles/Desktop/TableViewStyle.qml
+++ b/src/controls/Styles/Desktop/TableViewStyle.qml
@@ -45,10 +45,6 @@ import "."
 ScrollViewStyle {
     id: root
 
-    property var __syspal: SystemPalette {
-        colorGroup: control.enabled ?
-                        SystemPalette.Active : SystemPalette.Disabled
-    }
     readonly property TableView control: __control
     property bool activateItemOnSingleClick: __styleitem.styleHint("activateItemOnSingleClick")
     property color textColor: __styleitem.textColor
diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml
index c7e85ff4..5c623b80 100644
--- a/src/controls/Styles/Desktop/TextFieldStyle.qml
+++ b/src/controls/Styles/Desktop/TextFieldStyle.qml
@@ -54,17 +54,10 @@ Style {
         hover: hovered
         hints: control.styleHints
 
-        SystemPalette {
-            id: syspal
-            colorGroup: control.enabled ?
-                            SystemPalette.Active :
-                            SystemPalette.Disabled
-        }
-
-        property color textColor: syspal.text
+        property color textColor: __syspal.text
         property color placeholderTextColor: "darkGray"
-        property color selectionColor: syspal.highlight
-        property color selectedTextColor: syspal.highlightedText
+        property color selectionColor: __syspal.highlight
+        property color selectedTextColor: __syspal.highlightedText
 
 
         property bool rounded: !!hints["rounded"]