amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2024-10-06 12:13:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-01-01 20:38:18 +08:00
parent 4f66c546a8
commit 00e028be07
5 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
example/qml-Qt6/page/T_Settings.qml
View File

@ -67,7 +67,6 @@ FluScrollablePage{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
onClicked: { onClicked: {
FluApp.useSystemAppBar = !FluApp.useSystemAppBar FluApp.useSystemAppBar = !FluApp.useSystemAppBar
dialog_restart.open()
} }
} }
} }

1
example/qml/page/T_Settings.qml
View File

@ -70,7 +70,6 @@ FluScrollablePage{
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
onClicked: { onClicked: {
FluApp.useSystemAppBar = !FluApp.useSystemAppBar FluApp.useSystemAppBar = !FluApp.useSystemAppBar
dialog_restart.open()
} }
} }
} }

10
src/FluFramelessHelper.cpp
View File

@ -358,6 +358,16 @@ FluFramelessHelper::~FluFramelessHelper(){
if(isCompositionEnabled()){ if(isCompositionEnabled()){
qApp->removeNativeEventFilter(_nativeEvent); qApp->removeNativeEventFilter(_nativeEvent);
delete _nativeEvent; delete _nativeEvent;
HWND hwnd = reinterpret_cast<HWND>(window->winId());
SetWindowPos(hwnd,nullptr,0,0,0,0,SWP_NOZORDER | SWP_NOOWNERZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);
int w = window->width();
int h = window->height();
if(_fixSize.read().toBool()){
window->setMaximumSize(QSize(w,h));
window->setMinimumSize(QSize(w,h));
}
window->setWidth(w);
window->setHeight(h);
} }
#endif #endif
window->removeEventFilter(this); window->removeEventFilter(this);

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

@ -39,7 +39,7 @@ Window {
property bool showMaximize: true property bool showMaximize: true
property bool showStayTop: true property bool showStayTop: true
property bool autoMaximize: false property bool autoMaximize: false
property bool useSystemAppBar property bool useSystemAppBar: FluApp.useSystemAppBar
property color resizeBorderColor: { property color resizeBorderColor: {
if(window.active){ if(window.active){
return _accentColor return _accentColor
@ -70,10 +70,9 @@ Window {
_realHeight = height _realHeight = height
_realWidth = width _realWidth = width
moveWindowToDesktopCenter() moveWindowToDesktopCenter()
useSystemAppBar = FluApp.useSystemAppBar loader_frameless_helper.sourceComponent = Qt.binding(function(){
if(!useSystemAppBar){ return window.useSystemAppBar ? undefined : com_frameless
loader_frameless_helper.sourceComponent = com_frameless })
}
lifecycle.onCompleted(window) lifecycle.onCompleted(window)
initArgument(argument) initArgument(argument)
if(window.autoMaximize){ if(window.autoMaximize){

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

@ -38,7 +38,7 @@ Window {
property bool showMaximize: true property bool showMaximize: true
property bool showStayTop: true property bool showStayTop: true
property bool autoMaximize: false property bool autoMaximize: false
property bool useSystemAppBar property bool useSystemAppBar: FluApp.useSystemAppBar
property color resizeBorderColor: { property color resizeBorderColor: {
if(window.active){ if(window.active){
return _accentColor return _accentColor
@ -69,10 +69,9 @@ Window {
_realHeight = height _realHeight = height
_realWidth = width _realWidth = width
moveWindowToDesktopCenter() moveWindowToDesktopCenter()
useSystemAppBar = FluApp.useSystemAppBar loader_frameless_helper.sourceComponent = Qt.binding(function(){
if(!useSystemAppBar){ return window.useSystemAppBar ? undefined : com_frameless
loader_frameless_helper.sourceComponent = com_frameless })
}
lifecycle.onCompleted(window) lifecycle.onCompleted(window)
initArgument(argument) initArgument(argument)
if(window.autoMaximize){ if(window.autoMaximize){