From f8b7475261007b5c5bfa81e8e606f5c6bed50a39 Mon Sep 17 00:00:00 2001 From: "ZHUZICHU\\zhuzi" Date: Wed, 28 May 2025 17:35:52 +0800 Subject: [PATCH] fix bug --- example/example_en_US.ts | 55 ++++++++++++++----------------- example/example_zh_CN.ts | 55 ++++++++++++++----------------- example/qml/window/MainWindow.qml | 2 ++ src/FluFrameless.cpp | 3 ++ 4 files changed, 55 insertions(+), 60 deletions(-) diff --git a/example/example_en_US.ts b/example/example_en_US.ts index 390f78c6..01b97f79 100644 --- a/example/example_en_US.ts +++ b/example/example_en_US.ts @@ -612,104 +612,104 @@ MainWindow - - + + Quit - + Are you sure you want to exit the program? - + Minimize - + Friendly Reminder - + FluentUI is hidden from the tray, click on the tray to activate the window again - - + + Cancel - + Open in Separate Window - + Click Time - + Search - + Finish - + Next - + Previous - + Dark Mode - + Here you can switch to night mode. - + Hide Easter eggs - + Try a few more clicks!! - + Upgrade Tips - + FluentUI is currently up to date - + -- The current app version - + Now go and download the new version？ @@ -718,17 +718,17 @@ Updated content: - + OK - + The current version is already the latest - + The network is abnormal @@ -2567,11 +2567,6 @@ Some contents... window effect - - - - - T_TimePicker diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts index 6796d1c0..3cead65e 100644 --- a/example/example_zh_CN.ts +++ b/example/example_zh_CN.ts @@ -616,104 +616,104 @@ MainWindow - + Dark Mode 夜间模式 - - + + Quit 退出 - + Are you sure you want to exit the program? 您确定要退出程序吗 - + Minimize 最小化 - + Friendly Reminder 友情提示 - + FluentUI is hidden from the tray, click on the tray to activate the window again FluentUI 在托盘中处于隐藏状态，单击托盘以再次激活窗口 - - + + Cancel 取消 - + Open in Separate Window 在独立窗口中打开 - + Click Time 点击次数 - + Search 搜索 - + Finish 完成 - + Next 下一步 - + Previous 上一步 - + Here you can switch to night mode. 在这里，您可以切换到夜间模式。 - + Hide Easter eggs 隐藏彩蛋 - + Try a few more clicks!! 再试几下！！ - + Upgrade Tips 升级提示 - + FluentUI is currently up to date FluentUI 目前最新版本 - + -- The current app version -- 当前应用版本 - + Now go and download the new version？ @@ -726,17 +726,17 @@ Updated content: - + OK 确定 - + The current version is already the latest 当前版本已经是最新版本 - + The network is abnormal 网络异常 @@ -2756,11 +2756,6 @@ Some contents... window effect 窗口效果 - - - - - T_TimePicker diff --git a/example/qml/window/MainWindow.qml b/example/qml/window/MainWindow.qml index 7f3e0fbb..218fbb13 100644 --- a/example/qml/window/MainWindow.qml +++ b/example/qml/window/MainWindow.qml @@ -69,6 +69,8 @@ FluWindow { window.show() window.raise() window.requestActivate() + }else if(reason === SystemTrayIcon.Context){ + system_tray.menu.open() } } } diff --git a/src/FluFrameless.cpp b/src/FluFrameless.cpp index 52576267..1d3894e6 100644 --- a/src/FluFrameless.cpp +++ b/src/FluFrameless.cpp @@ -441,6 +441,9 @@ void FluFrameless::componentComplete() { window()->setFlag(Qt::CustomizeWindowHint, true); window()->setFlag(Qt::FramelessWindowHint, true); window()->setProperty("__borderWidth", 1); +#endif +#ifdef Q_OS_WIN + window()->setFlag(Qt::CustomizeWindowHint, true); #endif window()->installEventFilter(this); QGuiApplication::instance()->installNativeEventFilter(this);