Window switching, code cleanup

This commit is contained in:
DonO 2024-03-12 09:39:22 -05:00
parent 625355abbb
commit 000fc72340

View file

@ -379,7 +379,6 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
buf_add(&buf, get_type(*view)); buf_add(&buf, get_type(*view));
break; break;
case LAB_FIELD_WINFO: case LAB_FIELD_WINFO:
if (rc.window_switcher.all_workspaces) {
buf_add(&buf, (*view)->workspace->name); buf_add(&buf, (*view)->workspace->name);
if ((*view)->maximized) { if ((*view)->maximized) {
buf_add(&buf, " M "); buf_add(&buf, " M ");
@ -390,10 +389,9 @@ render_osd(struct server *server, cairo_t *cairo, int w, int h,
} else { } else {
buf_add(&buf, " "); buf_add(&buf, " ");
} }
}
buf_add(&buf, get_winfo(*view)); buf_add(&buf, get_winfo(*view));
if (rc.window_switcher.all_workspaces && if (wl_list_length(&server->outputs) > 1 &&
wl_list_length(&server->outputs) > 1) { output_is_usable(*view->output)) {
buf_add(&buf, (*view)->output->wlr_output->name); buf_add(&buf, (*view)->output->wlr_output->name);
} }
break; break;