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

fix(runtime): 修复布局函数为空导致的窗口未被布局 bug

Browse Source
This commit is contained in:
Zedhugh Chen
2026-06-23 03:24:04 +08:00
parent 40c2c328cd
commit 74b30a5d4b
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/runtime.c
View File

@@ -303,9 +303,6 @@ static const layout_result_t *runtime_layout_calc(runtime_t *runtime) {
auto workspace = state_workspace_get(state, output->current_workspace_id); auto workspace = state_workspace_get(state, output->current_workspace_id);
if (!workspace) continue; if (!workspace) continue;
auto layout_slot = layout_slot_get(&runtime->layouts, workspace->layout_id);
if (!layout_slot || !layout_slot->fn) continue;
size_t window_count = 0; size_t window_count = 0;
size_t window_list_capacity = 0; size_t window_list_capacity = 0;
window_id_t *window_ids = nullptr; window_id_t *window_ids = nullptr;
@@ -333,7 +330,8 @@ static const layout_result_t *runtime_layout_calc(runtime_t *runtime) {
} }
} }
if (window_count) { auto layout_func = layout_get(&runtime->layouts, workspace->layout_id);
if (window_count && layout_func) {
zdwm_layout_ctx_t ctx = { zdwm_layout_ctx_t ctx = {
.workspace_id = workspace->id, .workspace_id = workspace->id,
.focused_window_id = workspace->focused_window_id, .focused_window_id = workspace->focused_window_id,
@@ -342,7 +340,7 @@ static const layout_result_t *runtime_layout_calc(runtime_t *runtime) {
.window_ids = window_ids, .window_ids = window_ids,
.window_count = window_count, .window_count = window_count,
}; };
layout_slot->fn(&ctx, result); layout_func(&ctx, result);
} }
if (window_ids) p_delete(&window_ids); if (window_ids) p_delete(&window_ids);