amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-26 21:37:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #336 from Pemvin/main

Browse Source 
Update FluTour.qml
This commit is contained in:
zhuzichu 2023-11-24 21:19:06 +08:00 committed by GitHub
commit 412842d844
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Qt5/imports/FluentUI/Controls/FluTour.qml
View File

@ -120,8 +120,18 @@ Popup{
width: 500 width: 500
height: 88 + text_desc.height height: 88 + text_desc.height
color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
property int dir : {
if(y<d.pos.y)
return 1
return 0
}
x: Math.min(Math.max(0,d.pos.x+d.target.width/2-width/2),d.windowWidth-width) x: Math.min(Math.max(0,d.pos.x+d.target.width/2-width/2),d.windowWidth-width)
y: d.pos.y+d.target.height+control.targetMargins + 15 y:{
var ty=d.pos.y+d.target.height+control.targetMargins + 15
if((ty+height)>d.windowHeight)
return d.pos.y-height-control.targetMargins - 15
return ty
}
border.width: 0 border.width: 0
FluShadow{ FluShadow{
radius: 5 radius: 5
@ -194,9 +204,9 @@ Popup{
} }
} }
FluIcon{ FluIcon{
iconSource: FluentIcons.FlickDown iconSource: layout_panne.dir?FluentIcons.FlickUp:FluentIcons.FlickDown
color: layout_panne.color color: layout_panne.color
x: d.pos.x+d.target.width/2-10 x: d.pos.x+d.target.width/2-10
y: d.pos.y+d.target.height y: d.pos.y+(layout_panne.dir?-height:d.target.height)
} }
} }

10
src/Qt6/imports/FluentUI/Controls/FluTour.qml
View File

@ -109,8 +109,12 @@ Popup{
width: 500 width: 500
height: 88 + text_desc.height height: 88 + text_desc.height
color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1) color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
property int dir : (y<d.pos.y)?1:0
x: Math.min(Math.max(0,d.pos.x+d.target.width/2-width/2),d.window?.width-width) x: Math.min(Math.max(0,d.pos.x+d.target.width/2-width/2),d.window?.width-width)
y: d.pos.y+d.target.height+control.targetMargins + 15 y: {
var ty=d.pos.y+d.target.height+control.targetMargins + 15
return ((ty+height)>d.window?.height)?(d.pos.y-height-control.targetMargins - 15):ty
}
border.width: 0 border.width: 0
FluShadow{ FluShadow{
radius: 5 radius: 5
@ -183,9 +187,9 @@ Popup{
} }
} }
FluIcon{ FluIcon{
iconSource: FluentIcons.FlickDown iconSource: layout_panne.dir?FluentIcons.FlickUp:FluentIcons.FlickDown
color: layout_panne.color color: layout_panne.color
x: d.pos.x+d.target.width/2-10 x: d.pos.x+d.target.width/2-10
y: d.pos.y+d.target.height y: d.pos.y+(layout_panne.dir?-height:d.target.height)
} }
} }