refactor: acrylic by Windows.UI.Composition

std-microblock · cnbluefire · std-microblock · commit 287ab3ca9178 · 2026-03-22T03:51:56.000+08:00
Co-Authored-By: cnbluefire &lt;27049838+cnbluefire@users.noreply.github.com&gt;
diff --git a/CONFIG.md b/CONFIG.md
@@ -36,8 +36,6 @@ The following is a fully annotated default JSON configuration. Note that this **
 {
   "context_menu": {
     "theme": {
-      // Use DWM-rounded corners instead of SetWindowRgn rounded corners on Windows 11
-      "use_dwm_if_available": true,
       // Enable acrylic background effect
       "acrylic": true,
       // Corner radius (only effective when DWM-rounded corners are not used)
diff --git a/CONFIG_zh.md b/CONFIG_zh.md
@@ -30,8 +30,6 @@ Breeze Shell 配置文件的 JSON Schema 位于
 {
   "context_menu": {
     "theme": {
-      // 在 Windows 11 下使用 DWM 圆角而不是 SetWindowRgn 圆角
-      "use_dwm_if_available": true,
       // 启用亚克力背景效果
       "acrylic": true,
       // 圆角大小，仅在不使用 DWM 圆角时生效
diff --git a/deps/breeze-ui.lua b/deps/breeze-ui.lua
@@ -3,8 +3,8 @@ package("breeze-glfw")
     set_urls("https://github.com/breeze-shell/glfw.git")
     add_versions("2026.03.07+1", "a79c32a7d9ef4cd8a15b5f8ccbcdf9510c48da03")
 
-local BREEZE_UI_VER = "2026.03.07+15"
-local BREEZE_UI_HASH = "584d9d313ec12ac4725f6696773415aba477ce87"
+local BREEZE_UI_VER = "2026.03.22+1"
+local BREEZE_UI_HASH = "0c3989af0bee217cda691877431a80ae46dd3067"
 
 package("breeze-nanosvg")
     add_urls("https://github.com/std-microblock/breeze-ui.git")
@@ -39,7 +39,7 @@ package("breeze-ui")
     add_configs("shared", {description = "Build shared library.", default = false, type = "boolean", readonly = true})
 
     if is_plat("windows") then
-        add_syslinks("dwmapi", "shcore")
+        add_syslinks("dwmapi", "shcore", "windowsapp", "CoreMessaging")
     end
 
     on_install("windows", function (package)
diff --git a/resources/schema-zh_CN.json b/resources/schema-zh_CN.json
@@ -69,12 +69,6 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "use_dwm_if_available": {
-              "title": "尝试使用 Windows 11 圆角",
-              "description": "在 Windows 11 下使用 DWM 圆角而不是 SetWindowRgn 圆角",
-              "type": "boolean",
-              "default": true
-            },
             "background_opacity": {
               "title": "背景透明度",
               "description": "0.0 表示完全透明，1.0 表示完全不透明",
diff --git a/resources/schema.json b/resources/schema.json
@@ -69,12 +69,6 @@
           "type": "object",
           "additionalProperties": false,
           "properties": {
-            "use_dwm_if_available": {
-              "title": "Try Using Windows 11 Rounded Corners",
-              "description": "Use DWM rounded corners instead of SetWindowRgn rounded corners on Windows 11",
-              "type": "boolean",
-              "default": true
-            },
             "background_opacity": {
               "title": "Background Opacity",
               "description": "0.0 means fully transparent, 1.0 means fully opaque",
diff --git a/src/shell/config.h b/src/shell/config.h
@@ -31,7 +31,6 @@ struct config {
     static animated_float_conf _default_animation;
     struct context_menu {
         struct theme {
-            bool use_dwm_if_available = true;
             float background_opacity = 1;
             bool acrylic = true;
             float radius = 6;
@@ -72,6 +71,7 @@ struct config {
 
             // unused, only for backward compatibility
             float acrylic_opacity = 0.1;
+            bool use_dwm_if_available = true;
 
             struct animation {
                 struct main {
diff --git a/src/shell/entry.cc b/src/shell/entry.cc
@@ -77,7 +77,7 @@ void main() {
     set_thread_locale_utf8();
 
     init_logger();
-    install_error_handlers();
+    // install_error_handlers();
     config::run_config_loader();
 
     if (config::current->debug_console) {
diff --git a/src/shell/script/ts/src/config_page/components/ThemeCustomEditor.tsx b/src/shell/script/ts/src/config_page/components/ThemeCustomEditor.tsx
@@ -162,11 +162,6 @@ export const ThemeCustomEditor = memo(({
                 </OptionGroup>
 
                 <OptionGroup label={t("customEditor.theme.effects")}>
-                    <Toggle
-                        label={t("customEditor.theme.useDwm")}
-                        value={theme?.use_dwm_if_available ?? true}
-                        onChange={(v) => updateValue('use_dwm_if_available', v)}
-                    />
                     <Toggle
                         label={t("customEditor.theme.acrylic")}
                         value={theme?.acrylic ?? true}
diff --git a/src/shell/script/ts/src/config_page/pages/ContextMenuConfig.tsx b/src/shell/script/ts/src/config_page/pages/ContextMenuConfig.tsx
@@ -199,11 +199,6 @@ const ContextMenuConfig = memo(() => {
                     setNestedValue(newConfig, "reverse_if_open_to_up", v);
                     update(newConfig);
                 }} />
-                <Toggle label={t("settings.tryWin11RoundCorner")} value={getNestedValue(config, "theme.use_dwm_if_available") ?? true} onChange={(v) => {
-                    const newConfig = { ...config };
-                    setNestedValue(newConfig, "theme.use_dwm_if_available", v);
-                    update(newConfig);
-                }} />
                 <Toggle label={t("settings.acrylicBackground")} value={getNestedValue(config, "theme.acrylic") ?? true} onChange={(v) => {
                     const newConfig = { ...config };
                     setNestedValue(newConfig, "theme.acrylic", v);
diff --git a/src/shell/script/ts/src/menu/configMenu.ts b/src/shell/script/ts/src/menu/configMenu.ts
@@ -543,7 +543,6 @@ export const makeBreezeConfigMenu = (mainMenu) => {
                     createBoolToggle(sub, "垂直同步", "context_menu.vsync", true);
                     createBoolToggle(sub, "忽略自绘菜单", "context_menu.ignore_owner_draw", true);
                     createBoolToggle(sub, "向上展开时反向排列", "context_menu.reverse_if_open_to_up", true);
-                    createBoolToggle(sub, "尝试使用 Windows 11 圆角", "context_menu.theme.use_dwm_if_available", true);
                     createBoolToggle(sub, "亚克力背景效果", "context_menu.theme.acrylic", true);
                 }
             })
diff --git a/src/shell/widgets/background_widget.cc b/src/shell/widgets/background_widget.cc
@@ -17,12 +17,8 @@ background_widget::background_widget(bool is_main) {
                 : parse_color(
                       config::current->context_menu.theme.acrylic_color_dark);
 
-        auto acrylic = std::make_shared<ui::acrylic_background_widget>(
-            config::current->context_menu.theme.use_dwm_if_available
-                ? is_win11_or_later()
-                : false);
+        auto acrylic = std::make_shared<ui::acrylic_background_widget>();
         acrylic->acrylic_bg_color = acrylic_color;
-        acrylic->update_color();
         bg_impl = acrylic;
 
         if (light_color)
@@ -83,8 +79,7 @@ void background_widget::render(ui::nanovg_context ctx) {
         auto &theme = config::current->context_menu.theme;
         bool light = is_light_mode();
 
-        bool use_dwm = theme.use_dwm_if_available ? is_win11_or_later() : false;
-        bool use_self_drawn_border = theme.use_self_drawn_border && !use_dwm;
+        bool use_self_drawn_border = theme.use_self_drawn_border;
 
         float boarder_width = use_self_drawn_border ? theme.border_width : 0.0f;
         if (use_self_drawn_border) {

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,6 @@ The following is a fully annotated default JSON configuration. Note that this **`
`36`	`36`	`{`
`37`	`37`	`"context_menu": {`
`38`	`38`	`"theme": {`
`39`		`- // Use DWM-rounded corners instead of SetWindowRgn rounded corners on Windows 11`
`40`		`- "use_dwm_if_available": true,`
`41`	`39`	`// Enable acrylic background effect`
`42`	`40`	`"acrylic": true,`
`43`	`41`	`// Corner radius (only effective when DWM-rounded corners are not used)`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,6 @@ Breeze Shell 配置文件的 JSON Schema 位于`
`30`	`30`	`{`
`31`	`31`	`"context_menu": {`
`32`	`32`	`"theme": {`
`33`		`- // 在 Windows 11 下使用 DWM 圆角而不是 SetWindowRgn 圆角`
`34`		`- "use_dwm_if_available": true,`
`35`	`33`	`// 启用亚克力背景效果`
`36`	`34`	`"acrylic": true,`
`37`	`35`	`// 圆角大小，仅在不使用 DWM 圆角时生效`
Original file line number	Diff line number	Diff line change
`@@ -543,7 +543,6 @@ export const makeBreezeConfigMenu = (mainMenu) => {`
`543`	`543`	`createBoolToggle(sub, "垂直同步", "context_menu.vsync", true);`
`544`	`544`	`createBoolToggle(sub, "忽略自绘菜单", "context_menu.ignore_owner_draw", true);`
`545`	`545`	`createBoolToggle(sub, "向上展开时反向排列", "context_menu.reverse_if_open_to_up", true);`
`546`		`- createBoolToggle(sub, "尝试使用 Windows 11 圆角", "context_menu.theme.use_dwm_if_available", true);`
`547`	`546`	`createBoolToggle(sub, "亚克力背景效果", "context_menu.theme.acrylic", true);`
`548`	`547`	`}`
`549`	`548`	`})`