diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-09-28 16:43:23 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-09-29 15:27:10 +0000 |
| commit | 57f0da5e6464735cedf3f8624deb827b5fe98b53 (patch) | |
| tree | 2de7d59252c79f9f09ffbc8591d70f53538c26e1 /src/imports/controls/qquickdefaultstyle.cpp | |
| parent | 0e5f2190b242dc1fc0d36d96780a01c0fa3dc6d0 (diff) | |
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>
Diffstat (limited to 'src/imports/controls/qquickdefaultstyle.cpp')
| -rw-r--r-- | src/imports/controls/qquickdefaultstyle.cpp | 55 |
1 files changed, 55 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 |