Default: make popups and windows use palettes

Task-number: QTBUG-63369
Change-Id: Iabdb22852f319c1c7370b724f806523fcb1f1b91
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

10 files changed, 25 insertions, 32 deletions

diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index ae3d8ff5..12e877f7 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -43,13 +43,13 @@ import QtQuick.Templates 2.3 as T
 T.ApplicationWindow {
     id: window
 
-    color: Default.backgroundColor
+    color: palette.window
 
     overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(window.palette.shadow, 0.5)
     }
 
     overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(window.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml
index f6ecd7d6..24556db0 100644
--- a/src/imports/controls/Dialog.qml
+++ b/src/imports/controls/Dialog.qml
@@ -57,7 +57,8 @@ T.Dialog {
     padding: 12
 
     background: Rectangle {
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     header: Label {
@@ -70,6 +71,7 @@ T.Dialog {
             x: 1; y: 1
             width: parent.width - 2
             height: parent.height - 1
+            color: control.palette.window
         }
     }
 
@@ -78,10 +80,10 @@ T.Dialog {
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml
index 3209416f..1a962d9b 100644
--- a/src/imports/controls/DialogButtonBox.qml
+++ b/src/imports/controls/DialogButtonBox.qml
@@ -69,5 +69,6 @@ T.DialogButtonBox {
         x: 1; y: 1
         width: parent.width - 2
         height: parent.height - 2
+        color: control.palette.window
     }
 }
diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml
index 2e8500ba..b512d14c 100644
--- a/src/imports/controls/Drawer.qml
+++ b/src/imports/controls/Drawer.qml
@@ -59,21 +59,22 @@ T.Drawer {
     exit: Transition { SmoothedAnimation { velocity: 5 } }
 
     background: Rectangle {
+        color: control.palette.window
         Rectangle {
             readonly property bool horizontal: control.edge === Qt.LeftEdge || control.edge === Qt.RightEdge
             width: horizontal ? 1 : parent.width
             height: horizontal ? parent.height : 1
-            color: Default.frameDarkColor
+            color: control.palette.dark
             x: control.edge === Qt.LeftEdge ? parent.width - 1 : 0
             y: control.edge === Qt.TopEdge ? parent.height - 1 : 0
         }
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml
index 3c68314a..cb9f693d 100644
--- a/src/imports/controls/Menu.qml
+++ b/src/imports/controls/Menu.qml
@@ -66,15 +66,15 @@ T.Menu {
     background: Rectangle {
         implicitWidth: 200
         implicitHeight: 40
-        color: Default.backgroundColor
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml
index 1abd9608..6a78e89a 100644
--- a/src/imports/controls/Popup.qml
+++ b/src/imports/controls/Popup.qml
@@ -53,14 +53,15 @@ T.Popup {
     padding: 12
 
     background: Rectangle {
-        border.color: Default.frameDarkColor
+        color: control.palette.window
+        border.color: control.palette.dark
     }
 
     T.Overlay.modal: Rectangle {
-        color: Default.overlayModalColor
+        color: Color.transparent(control.palette.shadow, 0.5)
     }
 
     T.Overlay.modeless: Rectangle {
-        color: Default.overlayDimColor
+        color: Color.transparent(control.palette.shadow, 0.12)
     }
 }
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index d5bdfefe..b488125a 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -70,8 +70,6 @@ Module {
         isSingleton: true
         exportMetaObjectRevisions: [0]
         Property { name: "backgroundColor"; type: "QColor"; isReadonly: true }
-        Property { name: "overlayModalColor"; type: "QColor"; isReadonly: true }
-        Property { name: "overlayDimColor"; type: "QColor"; isReadonly: true }
         Property { name: "textColor"; type: "QColor"; isReadonly: true }
         Property { name: "textDarkColor"; type: "QColor"; isReadonly: true }
         Property { name: "textLightColor"; type: "QColor"; isReadonly: true }
diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp
index 3f91eb58..727df986 100644
--- a/src/imports/controls/qquickdefaultstyle.cpp
+++ b/src/imports/controls/qquickdefaultstyle.cpp
@@ -48,16 +48,6 @@ QColor QQuickDefaultStyle::backgroundColor() const
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
-QColor QQuickDefaultStyle::overlayModalColor() const
-{
-    return QColor::fromRgba(0x7F28282A);
-}
-
-QColor QQuickDefaultStyle::overlayDimColor() const
-{
-    return QColor::fromRgba(0x1F28282A);
-}
-
 QColor QQuickDefaultStyle::textColor() const
 {
     return QColor::fromRgba(0xFF353637);
diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h
index e2f9bf4a..b96a319e 100644
--- a/src/imports/controls/qquickdefaultstyle_p.h
+++ b/src/imports/controls/qquickdefaultstyle_p.h
@@ -57,8 +57,6 @@ class QQuickDefaultStyle : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QColor backgroundColor READ backgroundColor CONSTANT FINAL)
-    Q_PROPERTY(QColor overlayModalColor READ overlayModalColor CONSTANT FINAL)
-    Q_PROPERTY(QColor overlayDimColor READ overlayDimColor CONSTANT FINAL)
     Q_PROPERTY(QColor textColor READ textColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDarkColor READ textDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor textLightColor READ textLightColor CONSTANT FINAL)
@@ -97,8 +95,6 @@ public:
     explicit QQuickDefaultStyle(QObject *parent = nullptr);
 
     QColor backgroundColor() const;
-    QColor overlayModalColor() const;
-    QColor overlayDimColor() const;
     QColor textColor() const;
     QColor textDarkColor() const;
     QColor textLightColor() const;
diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp
index 60d76556..517e6077 100644
--- a/src/imports/controls/qquickdefaulttheme.cpp
+++ b/src/imports/controls/qquickdefaulttheme.cpp
@@ -61,9 +61,13 @@ QQuickDefaultTheme::QQuickDefaultTheme()
     systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637));
     systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2));
 
+    systemPalette.setColor(QPalette::Shadow, QColor::fromRgba(0xFF28282A));
+
     systemPalette.setColor(QPalette::ToolTipBase, QColor::fromRgba(0xFFFFFFFF));
     systemPalette.setColor(QPalette::ToolTipText, QColor::fromRgba(0xFF000000));
 
+    systemPalette.setColor(QPalette::Window, QColor::fromRgba(0xFFFFFFFF));
+
     systemPalette.setColor(QPalette::WindowText, QColor::fromRgba(0xFF26282A));
     systemPalette.setColor(QPalette::Disabled, QPalette::WindowText, QColor::fromRgba(0xFFBDBEBF));