diff --git a/meson.build b/meson.build index 0f7a01e80..762fceea7 100644 --- a/meson.build +++ b/meson.build @@ -15,10 +15,10 @@ endif prefix = get_option('prefix') sysconfdir = get_option('sysconfdir') -# 如果 sysconfdir 以 prefix 开头,去掉 prefix +# If sysconfdir starts with prefix, strip the prefix if sysconfdir.startswith(prefix) and not is_nixos sysconfdir = sysconfdir.substring(prefix.length()) - # 确保 sysconfdir 是绝对路径 + # Ensure sysconfdir is an absolute path if not sysconfdir.startswith('/') sysconfdir = '/' + sysconfdir endif diff --git a/src/dispatch/bind_define.h b/src/dispatch/bind_define.h index 47a864e39..0e5aee4f6 100644 --- a/src/dispatch/bind_define.h +++ b/src/dispatch/bind_define.h @@ -718,7 +718,8 @@ void restore_minimized(const Arg *arg) { show_hide_client(c); setborder_color(c); - arrange(c->mon, false, false); + uint32_t target = get_tags_first_tag(c->tags); + view_in_mon(&(Arg){.ui = target}, true, c->mon, true); focusclient(c, 1); warp_cursor(c); return;