amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-11-29 22:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-02-28 10:10:55 +08:00
parent eb276e7179
commit e4413419b8
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@ Window {
property bool useSystemAppBar
property color resizeBorderColor: {
if(window.active){
return _accentColor
return FluTheme.dark ? "#333333" : "#6E6E6E"
}
return FluTheme.dark ? "#3D3D3E" : "#A7A7A7"
}
@ -61,7 +61,6 @@ Window {
signal firstVisible()
property point _offsetXY : Qt.point(0,0)
property var _originalPos
property color _accentColor : FluTheme.dark ? "#333333" : "#6E6E6E"
property int _realHeight
property int _realWidth
property int _appBarHeight: appBar.height
@ -204,18 +203,22 @@ Window {
}
}
}
Component{
id:com_border
Rectangle{
color:"transparent"
border.width: window.resizeBorderWidth
border.color: window.resizeBorderColor
}
}
FluLoader{
id:loader_frameless_helper
}
Item{
id:layout_container
property bool isMaximum : window.visibility == Window.Maximized
anchors{
fill:parent
topMargin: _offsetXY.y
bottomMargin: isMaximum ? 0 : _offsetXY.y
leftMargin: isMaximum ? 0 :_offsetXY.x
rightMargin: isMaximum ? 0 : _offsetXY.x
}
onWidthChanged: {
window.appBar.width = width
@ -262,27 +265,22 @@ Window {
FluWindowLifecycle{
id:lifecycle
}
Rectangle{
anchors.fill: parent
color:"transparent"
border.width: window.resizeBorderWidth
border.color: window.resizeBorderColor
visible: {
if(window.useSystemAppBar || FluTools.isWindows10OrGreater()){
return false
}
if(FluTools.isMacos()){
if(window.visibility == Window.FullScreen){
return false
}
}else{
if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
return false
}
}
return true
}
}
// FluLoader{
// id:loader_border
// anchors.fill: parent
// sourceComponent: {
// if(window.useSystemAppBar){
// return undefined
// }
// if(FluTools.isWindows10OrGreater()){
// return undefined
// }
// if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
// return undefined
// }
// return com_border
// }
// }
}
function destoryOnClose(){
lifecycle.onDestoryOnClose()

48
src/Qt6/imports/FluentUI/Controls/FluWindow.qml
View File

@ -42,7 +42,7 @@ Window {
property bool useSystemAppBar
property color resizeBorderColor: {
if(window.active){
return _accentColor
return FluTheme.dark ? "#333333" : "#6E6E6E"
}
return FluTheme.dark ? "#3D3D3E" : "#A7A7A7"
}
@ -60,7 +60,6 @@ Window {
signal firstVisible()
property point _offsetXY : Qt.point(0,0)
property var _originalPos
property color _accentColor : FluTheme.dark ? "#333333" : "#6E6E6E"
property int _realHeight
property int _realWidth
property int _appBarHeight: appBar.height
@ -203,6 +202,14 @@ Window {
}
}
}
Component{
id:com_border
Rectangle{
color:"transparent"
border.width: window.resizeBorderWidth
border.color: window.resizeBorderColor
}
}
FluLoader{
id:loader_frameless_helper
}
@ -257,27 +264,22 @@ Window {
FluWindowLifecycle{
id:lifecycle
}
Rectangle{
anchors.fill: parent
color:"transparent"
border.width: window.resizeBorderWidth
border.color: window.resizeBorderColor
visible: {
if(window.useSystemAppBar || FluTools.isWindows10OrGreater()){
return false
}
if(FluTools.isMacos()){
if(window.visibility == Window.FullScreen){
return false
}
}else{
if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
return false
}
}
return true
}
}
// FluLoader{
// id:loader_border
// anchors.fill: parent
// sourceComponent: {
// if(window.useSystemAppBar){
// return undefined
// }
// if(FluTools.isWindows10OrGreater()){
// return undefined
// }
// if(window.visibility == Window.Maximized || window.visibility == Window.FullScreen){
// return undefined
// }
// return com_border
// }
// }
}
function destoryOnClose(){
lifecycle.onDestoryOnClose()