1 files changed, 12 insertions, 9 deletions
diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml
index 31f2e5d9..e174a70d 100644
--- a/src/imports/controls/ComboBox.qml
+++ b/src/imports/controls/ComboBox.qml
@@ -34,10 +34,11 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.6
+import QtQuick 2.8
 import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-import QtQuick.Templates 2.0 as T
+import QtQuick.Controls 2.1
+import QtQuick.Controls.impl 2.1
+import QtQuick.Templates 2.1 as T
 
 T.ComboBox {
     id: control
@@ -59,12 +60,13 @@ T.ComboBox {
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
         font.weight: control.currentIndex === index ? Font.DemiBold : Font.Normal
         highlighted: control.highlightedIndex == index
+        hoverEnabled: control.hoverEnabled
     }
 
     indicator: Image {
         x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
         y: control.topPadding + (control.availableHeight - height) / 2
-        source: "image://default/double-arrow/" + (control.visualFocus ? "#0066ff" : "#353637")
+        source: "image://default/double-arrow/" + (control.visualFocus ? Default.focusColor : Default.textColor)
         sourceSize.width: width
         sourceSize.height: height
         opacity: enabled ? 1 : 0.3
@@ -76,7 +78,7 @@ T.ComboBox {
 
         text: control.displayText
         font: control.font
-        color: control.visualFocus ? "#0066ff" : "#353637"
+        color: control.visualFocus ? Default.focusColor : Default.textColor
         horizontalAlignment: Text.AlignLeft
         verticalAlignment: Text.AlignVCenter
         elide: Text.ElideRight
@@ -87,10 +89,11 @@ T.ComboBox {
         implicitWidth: 120
         implicitHeight: 40
 
-        color: control.visualFocus ? (control.pressed ? "#cce0ff" : "#f0f6ff") :
-            (control.pressed || popup.visible ? "#d0d0d0" : "#e0e0e0")
-        border.color: "#0066ff"
+        color: control.visualFocus ? (control.pressed ? Default.focusPressedColor : Default.focusLightColor) :
+            (control.pressed || popup.visible ? Default.buttonPressedColor : Default.buttonColor)
+        border.color: Default.focusColor
         border.width: control.visualFocus ? 2 : 0
+        visible: !control.flat || control.pressed
     }
 
     popup: T.Popup {
@@ -115,7 +118,7 @@ T.ComboBox {
                 width: listview.width
                 height: listview.height
                 color: "transparent"
-                border.color: "#bdbebf"
+                border.color: Default.frameLightColor
             }
 
             T.ScrollIndicator.vertical: ScrollIndicator { }