amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-02-24 03:44:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #588 from Polaris-Night/main

Browse Source 
修复FluCarousel手动翻页的问题
This commit is contained in:
zhuzichu 2025-02-21 11:23:30 +08:00 committed by GitHub
commit db0588edcd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Qt5/imports/FluentUI/Controls/FluCarousel.qml
View File

@ -24,7 +24,7 @@ Item {
} }
QtObject{ QtObject{
id:d id:d
property bool flagXChanged: true property bool flagXChanged: false
property bool isAnimEnable: control.autoPlay && list_view.count>3 property bool isAnimEnable: control.autoPlay && list_view.count>3
function setData(data){ function setData(data){
if(!data){ if(!data){
@ -88,15 +88,18 @@ Item {
} }
} }
onMovementEnded:{ onMovementEnded:{
d.flagXChanged = false
list_view.highlightMoveDuration = 0
currentIndex = list_view.contentX/list_view.width currentIndex = list_view.contentX/list_view.width
if(currentIndex === 0){ if(currentIndex === 0){
currentIndex = list_view.count-2 currentIndex = list_view.count-2
}else if(currentIndex === list_view.count-1){ }else if(currentIndex === list_view.count-1){
currentIndex = 1 currentIndex = 1
} }
d.flagXChanged = false if(d.isAnimEnable){
timer_run.restart() timer_run.restart()
} }
}
onMovementStarted: { onMovementStarted: {
d.flagXChanged = true d.flagXChanged = true
timer_run.stop() timer_run.stop()
@ -104,12 +107,12 @@ Item {
onContentXChanged: { onContentXChanged: {
if(d.flagXChanged){ if(d.flagXChanged){
var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width) var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
var minY = Math.max(0,(list_view.width*(currentIndex-1))) var minX = Math.max(0,(list_view.width*(currentIndex-1)))
if(contentX>=maxX){ if(contentX>=maxX){
contentX = maxX contentX = maxX
} }
if(contentX<=minY){ if(contentX<=minX){
contentX = minY contentX = minX
} }
} }
} }

12
src/Qt5/imports/FluentUI/Controls/FluProgressBar.qml
View File

@ -14,13 +14,6 @@ ProgressBar{
id:d id:d
property real _radius: strokeWidth/2 property real _radius: strokeWidth/2
} }
onIndeterminateChanged:{
if(!indeterminate){
animator_x.duration = 0
rect_progress.x = 0
animator_x.duration = control.duration
}
}
background: Rectangle { background: Rectangle {
implicitWidth: 150 implicitWidth: 150
implicitHeight: control.strokeWidth implicitHeight: control.strokeWidth
@ -45,6 +38,11 @@ ProgressBar{
id: animator_x id: animator_x
running: control.indeterminate && control.visible running: control.indeterminate && control.visible
loops: Animation.Infinite loops: Animation.Infinite
onRunningChanged: {
if(!running){
rect_progress.x = 0
}
}
PropertyAnimation { PropertyAnimation {
from: -rect_progress.width from: -rect_progress.width
to: control.width + rect_progress.width to: control.width + rect_progress.width

13
src/Qt6/imports/FluentUI/Controls/FluCarousel.qml
View File

@ -24,7 +24,7 @@ Item {
} }
QtObject{ QtObject{
id:d id:d
property bool flagXChanged: true property bool flagXChanged: false
property bool isAnimEnable: control.autoPlay && list_view.count>3 property bool isAnimEnable: control.autoPlay && list_view.count>3
function setData(data){ function setData(data){
if(!data){ if(!data){
@ -88,15 +88,18 @@ Item {
} }
} }
onMovementEnded:{ onMovementEnded:{
d.flagXChanged = false
list_view.highlightMoveDuration = 0
currentIndex = list_view.contentX/list_view.width currentIndex = list_view.contentX/list_view.width
if(currentIndex === 0){ if(currentIndex === 0){
currentIndex = list_view.count-2 currentIndex = list_view.count-2
}else if(currentIndex === list_view.count-1){ }else if(currentIndex === list_view.count-1){
currentIndex = 1 currentIndex = 1
} }
d.flagXChanged = false if(d.isAnimEnable){
timer_run.restart() timer_run.restart()
} }
}
onMovementStarted: { onMovementStarted: {
d.flagXChanged = true d.flagXChanged = true
timer_run.stop() timer_run.stop()
@ -104,12 +107,12 @@ Item {
onContentXChanged: { onContentXChanged: {
if(d.flagXChanged){ if(d.flagXChanged){
var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width) var maxX = Math.min(list_view.width*(currentIndex+1),list_view.count*list_view.width)
var minY = Math.max(0,(list_view.width*(currentIndex-1))) var minX = Math.max(0,(list_view.width*(currentIndex-1)))
if(contentX>=maxX){ if(contentX>=maxX){
contentX = maxX contentX = maxX
} }
if(contentX<=minY){ if(contentX<=minX){
contentX = minY contentX = minX
} }
} }
} }

12
src/Qt6/imports/FluentUI/Controls/FluProgressBar.qml
View File

@ -15,13 +15,6 @@ ProgressBar{
id:d id:d
property real _radius: strokeWidth/2 property real _radius: strokeWidth/2
} }
onIndeterminateChanged:{
if(!indeterminate){
animator_x.duration = 0
rect_progress.x = 0
animator_x.duration = control.duration
}
}
background: Rectangle { background: Rectangle {
implicitWidth: 150 implicitWidth: 150
implicitHeight: control.strokeWidth implicitHeight: control.strokeWidth
@ -46,6 +39,11 @@ ProgressBar{
id: animator_x id: animator_x
running: control.indeterminate && control.visible running: control.indeterminate && control.visible
loops: Animation.Infinite loops: Animation.Infinite
onRunningChanged: {
if(!running){
rect_progress.x = 0
}
}
PropertyAnimation { PropertyAnimation {
from: -rect_progress.width from: -rect_progress.width
to: control.width + rect_progress.width to: control.width + rect_progress.width