Default: restore the style singleton attributes

It is known that people have made copies of the .qml files in order to
customize them to their liking. Therefore it is best to restore the old
API for now as it was in 391cba9a, before the palette changes. We will
deprecate and remove it gradually, to give people time to migrate to
palettes.

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

2 files changed, 73 insertions, 0 deletions

diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp
index f706d9ff..15c59798 100644
--- a/src/imports/controls/qquickdefaultstyle.cpp
+++ b/src/imports/controls/qquickdefaultstyle.cpp
@@ -48,6 +48,16 @@ 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);
@@ -63,6 +73,16 @@ QColor QQuickDefaultStyle::textLightColor() const
     return QColor::fromRgba(0xFFFFFFFF);
 }
 
+QColor QQuickDefaultStyle::textLinkColor() const
+{
+    return QColor::fromRgba(0xFF45A7D7);
+}
+
+QColor QQuickDefaultStyle::textSelectionColor() const
+{
+    return QColor::fromRgba(0xFFFDDD5C);
+}
+
 QColor QQuickDefaultStyle::textDisabledColor() const
 {
     return QColor::fromRgba(0xFFBDBEBF);
@@ -78,6 +98,11 @@ QColor QQuickDefaultStyle::textPlaceholderColor() const
     return QColor::fromRgba(0xFF777777);
 }
 
+QColor QQuickDefaultStyle::focusColor() const
+{
+    return QColor::fromRgba(0xFF0066FF);
+}
+
 QColor QQuickDefaultStyle::focusLightColor() const
 {
     return QColor::fromRgba(0xFFF0F6FF);
@@ -183,9 +208,39 @@ QColor QQuickDefaultStyle::frameLightColor() const
     return QColor::fromRgba(0xFFBDBEBF);
 }
 
+QColor QQuickDefaultStyle::scrollBarColor() const
+{
+    return QColor::fromRgba(0xFFBDBEBF);
+}
+
+QColor QQuickDefaultStyle::scrollBarPressedColor() const
+{
+    return QColor::fromRgba(0xFF28282A);
+}
+
+QColor QQuickDefaultStyle::progressBarColor() const
+{
+    return QColor::fromRgba(0xFFE4E4E4);
+}
+
+QColor QQuickDefaultStyle::pageIndicatorColor() const
+{
+    return QColor::fromRgba(0xFF28282A);
+}
+
+QColor QQuickDefaultStyle::separatorColor() const
+{
+    return QColor::fromRgba(0xFFCCCCCC);
+}
+
 QColor QQuickDefaultStyle::disabledDarkColor() const
 {
     return QColor::fromRgba(0xFF353637);
 }
 
+QColor QQuickDefaultStyle::disabledLightColor() const
+{
+    return QColor::fromRgba(0xFFBDBEBF);
+}
+
 QT_END_NAMESPACE
diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h
index 5c121159..fcd489a0 100644
--- a/src/imports/controls/qquickdefaultstyle_p.h
+++ b/src/imports/controls/qquickdefaultstyle_p.h
@@ -57,12 +57,17 @@ 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)
+    Q_PROPERTY(QColor textLinkColor READ textLinkColor CONSTANT FINAL)
+    Q_PROPERTY(QColor textSelectionColor READ textSelectionColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledColor READ textDisabledColor CONSTANT FINAL)
     Q_PROPERTY(QColor textDisabledLightColor READ textDisabledLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor textPlaceholderColor READ textPlaceholderColor CONSTANT FINAL)
+    Q_PROPERTY(QColor focusColor READ focusColor CONSTANT FINAL)
     Q_PROPERTY(QColor focusLightColor READ focusLightColor CONSTANT FINAL)
     Q_PROPERTY(QColor focusPressedColor READ focusPressedColor CONSTANT FINAL)
     Q_PROPERTY(QColor buttonColor READ buttonColor CONSTANT FINAL)
@@ -84,12 +89,20 @@ class QQuickDefaultStyle : public QObject
     Q_PROPERTY(QColor indicatorFrameDisabledColor READ indicatorFrameDisabledColor CONSTANT FINAL)
     Q_PROPERTY(QColor frameDarkColor READ frameDarkColor CONSTANT FINAL)
     Q_PROPERTY(QColor frameLightColor READ frameLightColor CONSTANT FINAL)
+    Q_PROPERTY(QColor scrollBarColor READ scrollBarColor CONSTANT FINAL)
+    Q_PROPERTY(QColor scrollBarPressedColor READ scrollBarPressedColor CONSTANT FINAL)
+    Q_PROPERTY(QColor progressBarColor READ progressBarColor CONSTANT FINAL)
+    Q_PROPERTY(QColor pageIndicatorColor READ pageIndicatorColor CONSTANT FINAL)
+    Q_PROPERTY(QColor separatorColor READ separatorColor CONSTANT FINAL)
     Q_PROPERTY(QColor disabledDarkColor READ disabledDarkColor CONSTANT FINAL)
+    Q_PROPERTY(QColor disabledLightColor READ disabledLightColor CONSTANT FINAL)
 
 public:
     explicit QQuickDefaultStyle(QObject *parent = nullptr);
 
     QColor backgroundColor() const;
+    QColor overlayModalColor() const;
+    QColor overlayDimColor() const;
     QColor textColor() const;
     QColor textDarkColor() const;
     QColor textLightColor() const;
@@ -98,6 +111,7 @@ public:
     QColor textDisabledColor() const;
     QColor textDisabledLightColor() const;
     QColor textPlaceholderColor() const;
+    QColor focusColor() const;
     QColor focusLightColor() const;
     QColor focusPressedColor() const;
     QColor buttonColor() const;
@@ -121,7 +135,11 @@ public:
     QColor frameLightColor() const;
     QColor scrollBarColor() const;
     QColor scrollBarPressedColor() const;
+    QColor progressBarColor() const;
+    QColor pageIndicatorColor() const;
+    QColor separatorColor() const;
     QColor disabledDarkColor() const;
+    QColor disabledLightColor() const;
 };
 
 QT_END_NAMESPACE