amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-05-09 22:41:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6b4ca8e6fbd7d3d1fb2b9ebb188b811ecfd3bb21 into 7a6efa41fb15272bd838ec1c3459357c5a6b41fe

Browse Source
This commit is contained in:
Polaris-Night 2025-02-18 06:18:44 +00:00 committed by GitHub
commit b1212a3a2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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