|
|
@ -713,7 +713,7 @@ static void render_container_tabbed(struct sway_output *output,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
struct sway_seat *seat = input_manager_current_seat(input_manager);
|
|
|
|
struct sway_seat *seat = input_manager_current_seat(input_manager);
|
|
|
|
struct sway_container *focus = seat_get_focus(seat);
|
|
|
|
struct sway_container *focus = seat_get_focus(seat);
|
|
|
|
struct sway_container *current = seat_get_active_child(seat, con);
|
|
|
|
struct sway_container *current = seat_get_active_current_child(seat, con);
|
|
|
|
struct border_colors *current_colors = NULL;
|
|
|
|
struct border_colors *current_colors = NULL;
|
|
|
|
struct sway_container_state *pstate = &con->current;
|
|
|
|
struct sway_container_state *pstate = &con->current;
|
|
|
|
|
|
|
|
|
|
|
@ -756,11 +756,13 @@ static void render_container_tabbed(struct sway_output *output,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Render surface and left/right/bottom borders
|
|
|
|
// Render surface and left/right/bottom borders
|
|
|
|
if (current->type == C_VIEW) {
|
|
|
|
if (current) {
|
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
if (current->type == C_VIEW) {
|
|
|
|
} else {
|
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
render_container(output, damage, current,
|
|
|
|
} else {
|
|
|
|
parent_focused || current == focus);
|
|
|
|
render_container(output, damage, current,
|
|
|
|
|
|
|
|
parent_focused || current == focus);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -775,7 +777,7 @@ static void render_container_stacked(struct sway_output *output,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
struct sway_seat *seat = input_manager_current_seat(input_manager);
|
|
|
|
struct sway_seat *seat = input_manager_current_seat(input_manager);
|
|
|
|
struct sway_container *focus = seat_get_focus(seat);
|
|
|
|
struct sway_container *focus = seat_get_focus(seat);
|
|
|
|
struct sway_container *current = seat_get_active_child(seat, con);
|
|
|
|
struct sway_container *current = seat_get_active_current_child(seat, con);
|
|
|
|
struct border_colors *current_colors = NULL;
|
|
|
|
struct border_colors *current_colors = NULL;
|
|
|
|
struct sway_container_state *pstate = &con->current;
|
|
|
|
struct sway_container_state *pstate = &con->current;
|
|
|
|
|
|
|
|
|
|
|
@ -812,11 +814,13 @@ static void render_container_stacked(struct sway_output *output,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// Render surface and left/right/bottom borders
|
|
|
|
// Render surface and left/right/bottom borders
|
|
|
|
if (current->type == C_VIEW) {
|
|
|
|
if (current) {
|
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
if (current->type == C_VIEW) {
|
|
|
|
} else {
|
|
|
|
render_view(output, damage, current, current_colors);
|
|
|
|
render_container(output, damage, current,
|
|
|
|
} else {
|
|
|
|
parent_focused || current == focus);
|
|
|
|
render_container(output, damage, current,
|
|
|
|
|
|
|
|
parent_focused || current == focus);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|