diff options
| -rw-r--r-- | src/imports/controls/Label.qml | 2 | ||||
| -rw-r--r-- | src/imports/controls/plugins.qmltypes | 1 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaultstyle.cpp | 5 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaultstyle_p.h | 1 | ||||
| -rw-r--r-- | src/imports/controls/qquickdefaulttheme.cpp | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index ba68d605..c03c9b47 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -43,5 +43,5 @@ T.Label { id: control color: control.palette.windowText - linkColor: Default.textLinkColor + linkColor: control.palette.link } diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index 864a3df8..85c137b2 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -75,7 +75,6 @@ Module { Property { name: "textColor"; type: "QColor"; isReadonly: true } Property { name: "textDarkColor"; type: "QColor"; isReadonly: true } Property { name: "textLightColor"; type: "QColor"; isReadonly: true } - Property { name: "textLinkColor"; type: "QColor"; isReadonly: true } Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true } Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true } diff --git a/src/imports/controls/qquickdefaultstyle.cpp b/src/imports/controls/qquickdefaultstyle.cpp index 15c59798..994506f4 100644 --- a/src/imports/controls/qquickdefaultstyle.cpp +++ b/src/imports/controls/qquickdefaultstyle.cpp @@ -73,11 +73,6 @@ QColor QQuickDefaultStyle::textLightColor() const return QColor::fromRgba(0xFFFFFFFF); } -QColor QQuickDefaultStyle::textLinkColor() const -{ - return QColor::fromRgba(0xFF45A7D7); -} - QColor QQuickDefaultStyle::textSelectionColor() const { return QColor::fromRgba(0xFFFDDD5C); diff --git a/src/imports/controls/qquickdefaultstyle_p.h b/src/imports/controls/qquickdefaultstyle_p.h index fcd489a0..e0931921 100644 --- a/src/imports/controls/qquickdefaultstyle_p.h +++ b/src/imports/controls/qquickdefaultstyle_p.h @@ -62,7 +62,6 @@ class QQuickDefaultStyle : public QObject 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) diff --git a/src/imports/controls/qquickdefaulttheme.cpp b/src/imports/controls/qquickdefaulttheme.cpp index 9a44ef34..13d6fea2 100644 --- a/src/imports/controls/qquickdefaulttheme.cpp +++ b/src/imports/controls/qquickdefaulttheme.cpp @@ -50,6 +50,8 @@ QQuickDefaultTheme::QQuickDefaultTheme() systemPalette.setColor(QPalette::Highlight, QColor::fromRgba(0xFF0066FF)); systemPalette.setColor(QPalette::Disabled, QPalette::Highlight, QColor::fromRgba(0xFFF0F6FF)); + systemPalette.setColor(QPalette::Link, QColor::fromRgba(0xFF45A7D7)); + systemPalette.setColor(QPalette::Text, QColor::fromRgba(0xFF353637)); systemPalette.setColor(QPalette::Disabled, QPalette::Text, QColor::fromRgba(0xFFC2C2C2)); |