amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-01-22 20:04:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2024-06-14 17:28:31 +08:00
parent ef65183320
commit 2b528a7072
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
example/src/main.cpp
View File

@ -59,9 +59,6 @@ int main(int argc, char *argv[])
QGuiApplication::setQuitOnLastWindowClosed(false); QGuiApplication::setQuitOnLastWindowClosed(false);
SettingsHelper::getInstance()->init(argv); SettingsHelper::getInstance()->init(argv);
Log::setup(argv,uri); Log::setup(argv,uri);
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
QQuickWindow::setGraphicsApi(QSGRendererInterface::OpenGL);
#endif
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);

6
src/Qt6/imports/FluentUI/Controls/FluAppBar.qml
View File

@ -43,12 +43,12 @@ Rectangle{
property alias layoutStandardbuttons: layout_standard_buttons property alias layoutStandardbuttons: layout_standard_buttons
property var maxClickListener : function(){ property var maxClickListener : function(){
if(FluTools.isMacos()){ if(FluTools.isMacos()){
if (d.win.visibility === Window.FullScreen) if (d.win.visibility === Window.FullScreen || d.win.visibility === Window.Maximized)
d.win.showNormal() d.win.showNormal()
else else
d.win.showFullScreen() d.win.showFullScreen()
}else{ }else{
if (d.win.visibility === Window.Maximized) if (d.win.visibility === Window.Maximized || d.win.visibility === Window.FullScreen)
d.win.showNormal() d.win.showNormal()
else else
d.win.showMaximized() d.win.showMaximized()
@ -93,7 +93,7 @@ Rectangle{
} }
return false return false
} }
property bool isRestore: win && Window.Maximized === win.visibility property bool isRestore: win && (Window.Maximized === win.visibility || Window.FullScreen === win.visibility)
property bool resizable: win && !(win.height === win.maximumHeight && win.height === win.minimumHeight && win.width === win.maximumWidth && win.width === win.minimumWidth) property bool resizable: win && !(win.height === win.maximumHeight && win.height === win.minimumHeight && win.width === win.maximumWidth && win.width === win.minimumWidth)
function containsPointToItem(point,item){ function containsPointToItem(point,item){
var pos = item.mapToGlobal(0,0) var pos = item.mapToGlobal(0,0)