mirror of
https://github.com/zhuzichu520/FluentUI.git
synced 2024-10-31 00:07:36 +08:00
update
This commit is contained in:
parent
4f66c546a8
commit
00e028be07
@ -67,7 +67,6 @@ FluScrollablePage{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onClicked: {
|
||||
FluApp.useSystemAppBar = !FluApp.useSystemAppBar
|
||||
dialog_restart.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -70,7 +70,6 @@ FluScrollablePage{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
onClicked: {
|
||||
FluApp.useSystemAppBar = !FluApp.useSystemAppBar
|
||||
dialog_restart.open()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -358,6 +358,16 @@ FluFramelessHelper::~FluFramelessHelper(){
|
||||
if(isCompositionEnabled()){
|
||||
qApp->removeNativeEventFilter(_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
|
||||
window->removeEventFilter(this);
|
||||
|
@ -39,7 +39,7 @@ Window {
|
||||
property bool showMaximize: true
|
||||
property bool showStayTop: true
|
||||
property bool autoMaximize: false
|
||||
property bool useSystemAppBar
|
||||
property bool useSystemAppBar: FluApp.useSystemAppBar
|
||||
property color resizeBorderColor: {
|
||||
if(window.active){
|
||||
return _accentColor
|
||||
@ -70,10 +70,9 @@ Window {
|
||||
_realHeight = height
|
||||
_realWidth = width
|
||||
moveWindowToDesktopCenter()
|
||||
useSystemAppBar = FluApp.useSystemAppBar
|
||||
if(!useSystemAppBar){
|
||||
loader_frameless_helper.sourceComponent = com_frameless
|
||||
}
|
||||
loader_frameless_helper.sourceComponent = Qt.binding(function(){
|
||||
return window.useSystemAppBar ? undefined : com_frameless
|
||||
})
|
||||
lifecycle.onCompleted(window)
|
||||
initArgument(argument)
|
||||
if(window.autoMaximize){
|
||||
|
@ -38,7 +38,7 @@ Window {
|
||||
property bool showMaximize: true
|
||||
property bool showStayTop: true
|
||||
property bool autoMaximize: false
|
||||
property bool useSystemAppBar
|
||||
property bool useSystemAppBar: FluApp.useSystemAppBar
|
||||
property color resizeBorderColor: {
|
||||
if(window.active){
|
||||
return _accentColor
|
||||
@ -69,10 +69,9 @@ Window {
|
||||
_realHeight = height
|
||||
_realWidth = width
|
||||
moveWindowToDesktopCenter()
|
||||
useSystemAppBar = FluApp.useSystemAppBar
|
||||
if(!useSystemAppBar){
|
||||
loader_frameless_helper.sourceComponent = com_frameless
|
||||
}
|
||||
loader_frameless_helper.sourceComponent = Qt.binding(function(){
|
||||
return window.useSystemAppBar ? undefined : com_frameless
|
||||
})
|
||||
lifecycle.onCompleted(window)
|
||||
initArgument(argument)
|
||||
if(window.autoMaximize){
|
||||
|
Loading…
Reference in New Issue
Block a user