Skip to content

sync: from linuxdeepin/dtkdeclarative #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Oct 13, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions qt6/src/qml/FlowStyle.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ QtObject {
property real hideOpacity: 0.0
property int hidePauseDuration: 450
property int hideDuration: 1500
property int hideWidthDuration: 100

property D.Palette background: D.Palette {
normal: Qt.rgba(0, 0, 0, 0.3)
Expand Down
40 changes: 34 additions & 6 deletions qt6/src/qml/ScrollBar.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,38 @@ T.ScrollBar {
policy: D.DTK.platformTheme.scrollBarPolicy

state: "hide"
property int __currentState: 0
function __calculateStateConditions() {
var moving = control.active && !control.pressed && !control.hovered
var shouldNormal = (control.policy === T.ScrollBar.AlwaysOn && !control.hovered && !control.pressed) ||
(moving && control.size < 1.0)

var shouldHover = ((control.hovered && (control.contentItem.opacity > 0 && control.contentItem.opacity <= 1)) && control.active && !control.pressed && control.size < 1.0)

var shouldActive = (control.pressed && control.size < 1.0)

var shouldHide = !shouldNormal && !shouldHover && !shouldActive

__currentState = shouldHide ? 0 : shouldNormal ? 1 : shouldHover ? 2 : 3
}

onHoveredChanged: {
Qt.callLater(() => { __calculateStateConditions() })
}
onPressedChanged: {
Qt.callLater(() => { __calculateStateConditions() })
}
onActiveChanged: {
Qt.callLater(() => { __calculateStateConditions() })
}
onSizeChanged: {
Qt.callLater(() => { __calculateStateConditions() })
}

states: [
State {
name: "hide"
when: control.policy === T.ScrollBar.AlwaysOff || (control.policy !== T.ScrollBar.AlwaysOn && (!control.active || control.size >= 1.0))
when: __currentState === 0
PropertyChanges {
target: control.contentItem
implicitWidth: DS.Style.scrollBar.width
Expand All @@ -30,24 +58,23 @@ T.ScrollBar {
},
State {
name: "normal"
property bool moving: control.active && !control.pressed && !control.hovered
when: (control.policy === T.ScrollBar.AlwaysOn && !control.hovered && !control.pressed) || (moving && control.size < 1.0)
when: __currentState === 1
PropertyChanges {
target: control.contentItem
implicitWidth: DS.Style.scrollBar.width
}
},
State {
name: "hover"
when: (control.hovered && !control.pressed && control.size < 1.0)
when: __currentState === 2
PropertyChanges {
target: control.contentItem
implicitWidth: DS.Style.scrollBar.activeWidth
}
},
State {
name: "active"
when: (control.pressed && control.size < 1.0)
when: __currentState === 3
PropertyChanges {
target: control.contentItem
implicitWidth: DS.Style.scrollBar.activeWidth
Expand All @@ -58,8 +85,9 @@ T.ScrollBar {
transitions: Transition {
to: "hide"
SequentialAnimation {
NumberAnimation { target: control.contentItem; duration: DS.Style.scrollBar.hideWidthDuration; property: "implicitWidth";}
PauseAnimation { duration: DS.Style.scrollBar.hidePauseDuration }
NumberAnimation { target: control.contentItem; duration: DS.Style.scrollBar.hideDuration; property: "opacity"; to:DS.Style.scrollBar.hideOpacity }
NumberAnimation { target: control.contentItem; duration: DS.Style.scrollBar.hideDuration; property: "opacity";}
}
}

Expand Down
Loading