aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/quick/controls/tabs/main.qml4
-rw-r--r--src/imports/controls/ScrollBar.qml2
-rw-r--r--src/imports/controls/ScrollIndicator.qml2
-rw-r--r--src/imports/controls/TextArea.qml3
-rw-r--r--src/imports/controls/TextField.qml3
-rw-r--r--src/imports/controls/ToolButton.qml4
-rw-r--r--src/imports/controls/qquicktheme.cpp43
-rw-r--r--src/imports/controls/qquicktheme_p.h6
-rw-r--r--src/imports/controls/qquickthemedata.cpp1
-rw-r--r--src/imports/controls/qquickthemedata_p.h4
-rw-r--r--src/imports/controls/theme.json1
-rw-r--r--src/imports/extras/Drawer.qml2
-rw-r--r--tests/auto/controls/data/tst_theme.qml11
13 files changed, 11 insertions, 75 deletions
diff --git a/examples/quick/controls/tabs/main.qml b/examples/quick/controls/tabs/main.qml
index 98bec1ee..37de78e9 100644
--- a/examples/quick/controls/tabs/main.qml
+++ b/examples/quick/controls/tabs/main.qml
@@ -161,7 +161,7 @@ ApplicationWindow {
height: parent.height
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
- opacity: Theme.disabledOpacity
+ color: Theme.disabledColor
font.pointSize: 8
Layout.preferredWidth: parent.width - discoverCreator.width - discoverMore.width - 2 * parent.spacing
visible: Layout.preferredWidth > 0
@@ -253,7 +253,7 @@ ApplicationWindow {
height: parent.height
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter
- opacity: Theme.disabledOpacity
+ color: Theme.disabledColor
font.pointSize: 8
Layout.preferredWidth: parent.width - activityCreator.width - activityMore.width - 2 * parent.spacing
visible: Layout.preferredWidth > 0
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index 51d74c7c..6a71e7be 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -71,7 +71,7 @@ AbstractScrollBar {
states: State {
name: "active"
when: control.active
- PropertyChanges { target: handle; opacity: 1.0 - control.Theme.disabledOpacity }
+ PropertyChanges { target: handle; opacity: 0.75 }
}
transitions: Transition {
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 4ad989f6..080c00ac 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -69,7 +69,7 @@ AbstractScrollIndicator {
states: State {
name: "active"
when: control.active
- PropertyChanges { target: indicator; opacity: 1.0 - control.Theme.disabledOpacity }
+ PropertyChanges { target: indicator; opacity: 0.75 }
}
transitions: [
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index b9b72559..be51a5d2 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -57,8 +57,7 @@ AbstractTextArea {
width: control.availableWidth
height: control.availableHeight
- color: control.Theme.textColor
- opacity: control.Theme.disabledOpacity
+ color: control.Theme.disabledColor
visible: !control.length
}
//! [placeholder]
diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml
index 7e439d05..946afe18 100644
--- a/src/imports/controls/TextField.qml
+++ b/src/imports/controls/TextField.qml
@@ -60,8 +60,7 @@ AbstractTextField {
width: control.availableWidth
height: control.availableHeight
- color: control.Theme.textColor
- opacity: control.Theme.disabledOpacity
+ color: control.Theme.disabledColor
visible: !control.displayText
}
//! [placeholder]
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 9a700bda..0c1d61f8 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -71,8 +71,8 @@ AbstractToolButton {
implicitWidth: 26
implicitHeight: 26
- opacity: control.Theme.disabledOpacity
- color: control.Theme.frameColor
+ opacity: 0.25
+ color: control.Theme.pressColor
visible: control.pressed
}
//! [background]
diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp
index 8ea625f5..59f1a78b 100644
--- a/src/imports/controls/qquicktheme.cpp
+++ b/src/imports/controls/qquicktheme.cpp
@@ -110,10 +110,6 @@ QT_BEGIN_NAMESPACE
\qmlattachedproperty real QtQuickControls2::Theme::spacing
*/
-/*!
- \qmlattachedproperty real QtQuickControls2::Theme::disabledOpacity
-*/
-
Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtquickcontrols/theme.json")))
static QQuickThemeAttached *themeInstance(QQmlEngine *engine)
@@ -228,8 +224,7 @@ public:
explicitTextColor(false),
explicitPadding(false),
explicitSpacing(false),
- explicitRoundness(false),
- explicitDisabledOpacity(false) { }
+ explicitRoundness(false) { }
enum Method { Implicit, Explicit, Inherit };
@@ -247,7 +242,6 @@ public:
void setPadding(qreal padding, Method method);
void setRoundness(qreal roundness, Method method);
void setSpacing(qreal spacing, Method method);
- void setDisabledOpacity(qreal opacity, Method method);
void inherit(QQuickThemeAttached *theme);
@@ -274,7 +268,6 @@ public:
bool explicitPadding;
bool explicitSpacing;
bool explicitRoundness;
- bool explicitDisabledOpacity;
};
void QQuickThemeAttachedPrivate::setAccentColor(const QColor &color, Method method)
@@ -487,21 +480,6 @@ void QQuickThemeAttachedPrivate::setSpacing(qreal spacing, Method method)
}
}
-void QQuickThemeAttachedPrivate::setDisabledOpacity(qreal opacity, Method method)
-{
- Q_Q(QQuickThemeAttached);
- if (!explicitDisabledOpacity || method != Inherit) {
- explicitDisabledOpacity = method == Explicit;
- if (data.disabledOpacity() != opacity) {
- data.setDisabledOpacity(opacity);
- emit q->disabledOpacityChanged();
-
- foreach (QQuickThemeAttached *child, childThemes)
- child->d_func()->setDisabledOpacity(opacity, Inherit);
- }
- }
-}
-
void QQuickThemeAttachedPrivate::inherit(QQuickThemeAttached *theme)
{
setAccentColor(theme->accentColor(), Inherit);
@@ -518,7 +496,6 @@ void QQuickThemeAttachedPrivate::inherit(QQuickThemeAttached *theme)
setPadding(theme->padding(), Inherit);
setRoundness(theme->roundness(), Inherit);
setSpacing(theme->spacing(), Inherit);
- setDisabledOpacity(theme->disabledOpacity(), Inherit);
}
const QQuickThemeData &QQuickThemeAttachedPrivate::resolve() const
@@ -846,22 +823,4 @@ void QQuickThemeAttached::resetSpacing()
d->setSpacing(d->resolve().spacing(), QQuickThemeAttachedPrivate::Implicit);
}
-qreal QQuickThemeAttached::disabledOpacity() const
-{
- Q_D(const QQuickThemeAttached);
- return d->data.disabledOpacity();
-}
-
-void QQuickThemeAttached::setDisabledOpacity(qreal opacity)
-{
- Q_D(QQuickThemeAttached);
- d->setDisabledOpacity(opacity, QQuickThemeAttachedPrivate::Explicit);
-}
-
-void QQuickThemeAttached::resetDisabledOpacity()
-{
- Q_D(QQuickThemeAttached);
- d->setDisabledOpacity(d->resolve().disabledOpacity(), QQuickThemeAttachedPrivate::Implicit);
-}
-
QT_END_NAMESPACE
diff --git a/src/imports/controls/qquicktheme_p.h b/src/imports/controls/qquicktheme_p.h
index 90941ea1..9dbe1c15 100644
--- a/src/imports/controls/qquicktheme_p.h
+++ b/src/imports/controls/qquicktheme_p.h
@@ -74,7 +74,6 @@ class QQuickThemeAttached : public QObject
Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL)
Q_PROPERTY(qreal roundness READ roundness WRITE setRoundness RESET resetRoundness NOTIFY roundnessChanged FINAL)
Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing RESET resetSpacing NOTIFY spacingChanged FINAL)
- Q_PROPERTY(qreal disabledOpacity READ disabledOpacity WRITE setDisabledOpacity RESET resetDisabledOpacity NOTIFY disabledOpacityChanged FINAL)
public:
explicit QQuickThemeAttached(const QQuickThemeData &data, QObject *parent = Q_NULLPTR);
@@ -141,10 +140,6 @@ public:
void setSpacing(qreal spacing);
void resetSpacing();
- qreal disabledOpacity() const;
- void setDisabledOpacity(qreal opacity);
- void resetDisabledOpacity();
-
Q_SIGNALS:
void accentColorChanged();
void backgroundColorChanged();
@@ -160,7 +155,6 @@ Q_SIGNALS:
void paddingChanged();
void roundnessChanged();
void spacingChanged();
- void disabledOpacityChanged();
private:
Q_DISABLE_COPY(QQuickThemeAttached)
diff --git a/src/imports/controls/qquickthemedata.cpp b/src/imports/controls/qquickthemedata.cpp
index 637a5643..1b6fb26a 100644
--- a/src/imports/controls/qquickthemedata.cpp
+++ b/src/imports/controls/qquickthemedata.cpp
@@ -95,7 +95,6 @@ bool QQuickThemeData::load(const QString &filePath)
d->padding = readNumberValue(theme.value(QStringLiteral("padding")), 6);
d->roundness = readNumberValue(theme.value(QStringLiteral("roundness")), 3);
d->spacing = readNumberValue(theme.value(QStringLiteral("spacing")), 6);
- d->disabledOpacity = readNumberValue(theme.value(QStringLiteral("disabledOpacity")), 0.3);
return true;
}
diff --git a/src/imports/controls/qquickthemedata_p.h b/src/imports/controls/qquickthemedata_p.h
index 893cae9c..85c938e9 100644
--- a/src/imports/controls/qquickthemedata_p.h
+++ b/src/imports/controls/qquickthemedata_p.h
@@ -103,9 +103,6 @@ public:
qreal spacing() const { return d->spacing; }
void setSpacing(qreal spacing) { d->spacing = spacing; }
- qreal disabledOpacity() const { return d->disabledOpacity; }
- void setDisabledOpacity(qreal opacity) { d->disabledOpacity = opacity; }
-
private:
struct Data : public QSharedData {
QColor accentColor;
@@ -122,7 +119,6 @@ private:
qreal padding;
qreal spacing;
qreal roundness;
- qreal disabledOpacity;
};
QSharedDataPointer<Data> d;
};
diff --git a/src/imports/controls/theme.json b/src/imports/controls/theme.json
index 43b029f2..53196bf7 100644
--- a/src/imports/controls/theme.json
+++ b/src/imports/controls/theme.json
@@ -12,6 +12,5 @@
"textColor": "#26282a",
"padding": 6,
"roundness": 3,
- "disabledOpacity": 0.3,
"spacing": 6
}
diff --git a/src/imports/extras/Drawer.qml b/src/imports/extras/Drawer.qml
index 421cdc93..1ee0cddf 100644
--- a/src/imports/extras/Drawer.qml
+++ b/src/imports/extras/Drawer.qml
@@ -47,7 +47,7 @@ AbstractDrawer {
//! [background]
background: Rectangle {
color: control.Theme.shadowColor
- opacity: position * control.Theme.disabledOpacity
+ opacity: position * 0.75
}
//! [background]
diff --git a/tests/auto/controls/data/tst_theme.qml b/tests/auto/controls/data/tst_theme.qml
index c2d76366..439afa0b 100644
--- a/tests/auto/controls/data/tst_theme.qml
+++ b/tests/auto/controls/data/tst_theme.qml
@@ -72,7 +72,6 @@ TestCase {
Theme.padding: 111
Theme.roundness: 222
Theme.spacing: 333
- Theme.disabledOpacity: 0.123
}
}
@@ -97,7 +96,6 @@ TestCase {
Theme.padding: 111
Theme.roundness: 222
Theme.spacing: 333
- Theme.disabledOpacity: 0.123
}
}
@@ -126,7 +124,6 @@ TestCase {
verify(control.Theme.padding !== undefined)
verify(control.Theme.roundness !== undefined)
verify(control.Theme.spacing !== undefined)
- verify(control.Theme.disabledOpacity !== undefined)
control.destroy()
}
@@ -146,7 +143,6 @@ TestCase {
control.Theme.padding = 111
control.Theme.roundness = 222
control.Theme.spacing = 333
- control.Theme.disabledOpacity = 0.123
compare(control.Theme.accentColor, "#111111")
compare(control.Theme.backgroundColor, "#222222")
compare(control.Theme.baseColor, "#333333")
@@ -160,7 +156,6 @@ TestCase {
compare(control.Theme.padding, 111)
compare(control.Theme.roundness, 222)
compare(control.Theme.spacing, 333)
- compare(control.Theme.disabledOpacity, 0.123)
control.destroy()
}
@@ -180,7 +175,6 @@ TestCase {
compare(control.Theme.padding, 111)
compare(control.Theme.roundness, 222)
compare(control.Theme.spacing, 333)
- compare(control.Theme.disabledOpacity, 0.123)
control.Theme.accentColor = undefined
control.Theme.backgroundColor = undefined
control.Theme.baseColor = undefined
@@ -194,7 +188,6 @@ TestCase {
control.Theme.padding = undefined
control.Theme.roundness = undefined
control.Theme.spacing = undefined
- control.Theme.disabledOpacity = undefined
compare(control.Theme.accentColor, testCase.Theme.accentColor)
compare(control.Theme.backgroundColor, testCase.Theme.backgroundColor)
compare(control.Theme.baseColor, testCase.Theme.baseColor)
@@ -208,7 +201,6 @@ TestCase {
compare(control.Theme.padding, testCase.Theme.padding)
compare(control.Theme.roundness, testCase.Theme.roundness)
compare(control.Theme.spacing, testCase.Theme.spacing)
- compare(control.Theme.disabledOpacity, testCase.Theme.disabledOpacity)
control.destroy()
}
@@ -226,8 +218,7 @@ TestCase {
{ tag: "textColor", value1: "#999999", value2: "#909090" },
{ tag: "padding", value1: 11, value2: 10 },
{ tag: "roundness", value1: 22, value2: 20 },
- { tag: "spacing", value1: 33, value2: 30 },
- { tag: "disabledOpacity", value1: 0.123, value2: 0.345 }
+ { tag: "spacing", value1: 33, value2: 30 }
]
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 10:13:36 +0000