From 901ca8077e890a06b1cac6ef6578e48eabad00eb Mon Sep 17 00:00:00 2001
From: jeffrey0326 <547913081@qq.com>
Date: Sat, 31 Aug 2024 20:12:01 +0800
Subject: [PATCH] update
---
example/example_en_US.ts | 11 ++++++-----
example/example_zh_CN.ts | 11 ++++++-----
example/qml/page/T_Theme.qml | 11 -----------
src/Qt5/imports/FluentUI/Controls/FluWindow.qml | 2 +-
src/Qt6/imports/FluentUI/Controls/FluWindow.qml | 4 +++-
5 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/example/example_en_US.ts b/example/example_en_US.ts
index 2ed0bd6b..f371cbc4 100644
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@@ -2261,26 +2261,27 @@ Some contents...
-
+
+ Rounded Window
-
+
-
+
-
+
-
+
diff --git a/example/example_zh_CN.ts b/example/example_zh_CN.ts
index 9d48f812..182a4b86 100644
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@@ -2443,26 +2443,27 @@ Some contents...
-
+
+ Rounded Window
-
+
-
+
-
+
-
+
diff --git a/example/qml/page/T_Theme.qml b/example/qml/page/T_Theme.qml
index fc587066..8576750c 100644
--- a/example/qml/page/T_Theme.qml
+++ b/example/qml/page/T_Theme.qml
@@ -119,17 +119,6 @@ FluScrollablePage{
FluTheme.animationEnabled = !FluTheme.animationEnabled
}
}
- FluText{
- text: qsTr("Rounded Window")
- Layout.topMargin: 20
- }
- FluToggleSwitch{
- Layout.topMargin: 5
- checked: window.roundCornerEnable
- onClicked: {
- window.roundCornerEnable = !window.roundCornerEnable
- }
- }
FluText{
text: qsTr("Open Blur Window")
Layout.topMargin: 20
diff --git a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
index 0cf189a7..da1d6fe2 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluWindow.qml
@@ -17,7 +17,7 @@ Window {
property int blurRadius: 60
property alias effect: frameless.effect
readonly property alias effective: frameless.effective
- readonly property var availableEffects: frameless.availableEffects
+ readonly property alias availableEffects: frameless.availableEffects
property Item appBar: FluAppBar {
title: window.title
height: 30
diff --git a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
index ba9bdf5b..1f04c023 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluWindow.qml
@@ -16,7 +16,7 @@ Window {
property int blurRadius: 60
property alias effect: frameless.effect
readonly property alias effective: frameless.effective
- readonly property var availableEffects: frameless.availableEffects
+ readonly property alias availableEffects: frameless.availableEffects
property Item appBar: FluAppBar {
title: window.title
height: 30
@@ -113,6 +113,8 @@ Window {
fixSize: window.fixSize
topmost: window.stayTop
disabled: FluApp.useSystemAppBar
+ isDarkMode: FluTheme.dark
+ useSystemEffect: !FluTheme.blurBehindWindowEnabled
Component.onCompleted: {
frameless.setHitTestVisible(appBar.layoutMacosButtons)
frameless.setHitTestVisible(appBar.layoutStandardbuttons)