amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-07-06 02:15:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #455

Browse Source
This commit is contained in:
朱子楚\zhuzi
2024-03-11 12:36:20 +08:00
parent d79a7df389
commit 38a277801d
6 changed files with 44 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Qt5/imports/FluentUI/Controls/FluAppBar.qml
View File

@ -37,19 +37,19 @@ Rectangle{
property var maxClickListener : function(){
if(FluTools.isMacos()){
if (d.win.visibility === Window.FullScreen)
d.win.visibility = Window.Windowed
d.win.showNormal()
else
d.win.visibility = Window.FullScreen
d.win.showFullScreen()
}else{
if (d.win.visibility === Window.Maximized)
d.win.visibility = Window.Windowed
d.win.showNormal()
else
d.win.visibility = Window.Maximized
d.win.showMaximized()
d.hoverMaxBtn = false
}
}
property var minClickListener: function(){
d.win.visibility = Window.Minimized
d.win.showMinimized()
}
property var closeClickListener : function(){
d.win.close()

25
src/Qt5/imports/FluentUI/Controls/FluWindow.qml
View File

@ -58,8 +58,6 @@ Window {
signal showSystemMenu
signal initArgument(var argument)
signal firstVisible()
property point _offsetXY : Qt.point(0,0)
property var _originalPos
property int _realHeight
property int _realWidth
property int _appBarHeight: appBar.height
@ -91,19 +89,6 @@ Window {
Component.onDestruction: {
lifecycle.onDestruction()
}
on_OriginalPosChanged: {
if(_originalPos){
var dx = (_originalPos.x - screen.virtualX)/screen.devicePixelRatio
var dy = (_originalPos.y - screen.virtualY)/screen.devicePixelRatio
if(dx<0 && dy<0){
_offsetXY = Qt.point(Math.abs(dx)-1,Math.abs(dy)-1)
}else{
_offsetXY = Qt.point(0,0)
}
}else{
_offsetXY = Qt.point(0,0)
}
}
onShowSystemMenu: {
if(loader_frameless_helper.item){
loader_frameless_helper.item.showSystemMenu()
@ -223,7 +208,6 @@ Window {
id:layout_container
anchors{
fill:parent
topMargin: _offsetXY.y
}
onWidthChanged: {
window.appBar.width = width
@ -337,4 +321,13 @@ Window {
function layoutContent(){
return layout_content
}
function showMaximized(){
if(FluTools.isWin()){
if(loader_frameless_helper.item){
loader_frameless_helper.item.showMaximized()
}
}else{
window.visibility = Qt.WindowMaximized
}
}
}