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

Merge pull request from gaetandezeiraud/fix-flunavigationview-nostackpush

Browse Source 
Fix FluNavigationView noStackPush
This commit is contained in:
zhuzichu 2024-12-01 19:52:11 +08:00 committed by GitHub
commit a8ca78f3f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
src
Qt5/imports/FluentUI/Controls
FluNavigationView.qml
Qt6/imports/FluentUI/Controls
FluNavigationView.qml

2
src/Qt5/imports/FluentUI/Controls/FluNavigationView.qml

@ -1313,7 +1313,7 @@ Item {
d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex]) d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
} }
function noStackPush(){ function noStackPush(){
if(loader_content.source.toString() === url){ if(loader_content.source.toString() === url && Object.keys(argument).length === 0){
return return
} }
loader_content.setSource(url,argument) loader_content.setSource(url,argument)

2
src/Qt6/imports/FluentUI/Controls/FluNavigationView.qml

@ -1314,7 +1314,7 @@ Item {
d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex]) d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
} }
function noStackPush(){ function noStackPush(){
if(loader_content.source.toString() === url){ if(loader_content.source.toString() === url && Object.keys(argument).length === 0){
return return
} }
loader_content.setSource(url,argument) loader_content.setSource(url,argument)