zedhugh/zdwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(policy): 修复切换焦点时的边框颜色设置和新窗口可能不触发布局 bug

Browse Source
This commit is contained in:
Zedhugh Chen
2026-06-23 03:22:45 +08:00
parent 71f050c2f3
commit 40c2c328cd
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/policy.c
View File

@@ -865,9 +865,6 @@ static void set_foucs_window(
auto workspace = state_workspace_get(state, workspace_id); auto workspace = state_workspace_get(state, workspace_id);
if (!workspace) return; if (!workspace) return;
auto old_focused_window_id = workspace->focused_window_id;
if (window_id == old_focused_window_id) return;
state_workspace_set_focused_window(state, workspace_id, window_id); state_workspace_set_focused_window(state, workspace_id, window_id);
plan_push_focus_effect(plan, window_id); plan_push_focus_effect(plan, window_id);
@@ -875,9 +872,12 @@ static void set_foucs_window(
auto color = &border->focused_color; auto color = &border->focused_color;
plan_push_change_border_color_effect(plan, window_id, color); plan_push_change_border_color_effect(plan, window_id, color);
} }
if (state_window_get(state, old_focused_window_id)) { for (size_t i = 0; i < state_window_count(state); ++i) {
auto window = state_window_at(state, i);
if (window->workspace_id != workspace_id) continue;
if (workspace->focused_window_id == window->id) continue;
auto color = &border->normal_color; auto color = &border->normal_color;
plan_push_change_border_color_effect(plan, old_focused_window_id, color); plan_push_change_border_color_effect(plan, window->id, color);
} }
} }
@@ -936,8 +936,11 @@ static void manage_window(
state_window_set_floating(state, window_id, command->floating); state_window_set_floating(state, window_id, command->floating);
} }
auto workspace = state_workspace_get(state, workspace_id);
auto need_layout = window_need_layout(window); auto need_layout = window_need_layout(window);
if (need_layout) { auto layout_func = layout_get(ctx->layouts, workspace->layout_id);
if (need_layout && layout_func) {
adjust_layout_windows_border_width(state, ctx->border->width, workspace_id); adjust_layout_windows_border_width(state, ctx->border->width, workspace_id);
} else { } else {
state_window_set_border_width(state, window_id, ctx->border->width); state_window_set_border_width(state, window_id, ctx->border->width);
@@ -948,11 +951,7 @@ static void manage_window(
plan_push_map_effect(plan, window_id); plan_push_map_effect(plan, window_id);
plan_push_focus_effect(plan, window_id); plan_push_focus_effect(plan, window_id);
if (window_need_layout(window)) { plan->need_relayout = true;
plan->need_relayout = true;
return;
}
effect_t configure_effect = { effect_t configure_effect = {
.type = ZDWM_EFFECT_CONFIGURE_WINDOW, .type = ZDWM_EFFECT_CONFIGURE_WINDOW,