'rect' date respects 'numbers' dial style position

This commit is contained in:
darksignal7
2025-10-08 20:10:21 +03:00
parent 5c29ac8d1e
commit 4fb7f7c1e7
2 changed files with 28 additions and 14 deletions
@@ -9,6 +9,7 @@ import QtQuick
Item { Item {
id: root id: root
readonly property string dialStyle: Config.options.background.clock.cookie.dialNumberStyle
property string style: "rotating" property string style: "rotating"
property color colOnBackground: Appearance.colors.colOnSecondaryContainer property color colOnBackground: Appearance.colors.colOnSecondaryContainer
property color colBackground: Appearance.colors.colOnSecondaryContainer property color colBackground: Appearance.colors.colOnSecondaryContainer
@@ -23,28 +24,22 @@ Item {
} }
} }
// Square date (only today's number) in right side of the clock // Rectangle date (only today's number) in right side of the clock
Loader { Loader {
width: root.style === "rect" ? 45 : 0 id: rectLoader
height: root.style === "rect" ? 30 : 0 z: 0
Behavior on height { property real animIndex: root.style === "rect" ? 1.0 : 0.0
animation: Appearance.animation.elementResize.numberAnimation.createObject(this) Behavior on animIndex {
}
Behavior on width {
animation: Appearance.animation.elementResize.numberAnimation.createObject(this) animation: Appearance.animation.elementResize.numberAnimation.createObject(this)
} }
active: height > 0 active: animIndex > 0
anchors {
verticalCenter: parent.verticalCenter
right: parent.right
rightMargin: 10
}
sourceComponent: RectangleDate { sourceComponent: RectangleDate {
color: root.colBackground color: root.colBackground
radius: Appearance.rounding.small radius: Appearance.rounding.small
animIndex: rectLoader.animIndex
} }
} }
@@ -8,6 +8,25 @@ import QtQuick
Rectangle { Rectangle {
z: 1 z: 1
readonly property string dialStyle: Config.options.background.clock.cookie.dialNumberStyle
property real animIndex: 0
opacity: animIndex
width: 45
height: 30
x: dialStyle === "numbers" ? 155 : 175
y: dialStyle === "numbers" ? 155 : 100
Behavior on x {
animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
}
Behavior on y {
animation: Appearance.animation.elementMoveFast.numberAnimation.createObject(this)
}
StyledText { StyledText {
opacity: root.style === "rect" ? 1.0 : 0 opacity: root.style === "rect" ? 1.0 : 0
Behavior on opacity { Behavior on opacity {