Merge remote-tracking branch 'origin' into render_blur_cleanup

This commit is contained in:
William McKinnon 2023-07-23 23:03:01 -04:00
commit 27e7a9b4ff
2 changed files with 5 additions and 1 deletions

View file

@ -126,7 +126,7 @@ The SwayFX team would like to first and foremost thank the maintainers and contr
We would also like to thank the talented artists in our community for contibuting the visual assets that give this project charm: We would also like to thank the talented artists in our community for contibuting the visual assets that give this project charm:
+ pkdesuwu and honchokomodo for creating the swayfx mascot: https://twitter.com/pkdesuwu/status/1664517033017368576 + pkdesuwu and honchokomodo for creating the swayfx mascot: https://twitter.com/pkdesuwu/status/1664517033017368576
+ spooky_skeleton for the swayfx logo, and basil.cafe for making some fine adjustments to it + spooky_skeleton for the swayfx logo, and [Basil](https://basil.cafe) for making some fine adjustments to it
Lastly, we would like to thank you, the community, for enjoying and using window manager that we have spent so much time maintaining. Lastly, we would like to thank you, the community, for enjoying and using window manager that we have spent so much time maintaining.

View file

@ -1381,6 +1381,10 @@ static void render_containers_linear(struct sway_output *output,
for (int i = 0; i < parent->children->length; ++i) { for (int i = 0; i < parent->children->length; ++i) {
struct sway_container *child = parent->children->items[i]; struct sway_container *child = parent->children->items[i];
if (container_is_scratchpad_hidden(child)) {
continue;
}
if (child->view) { if (child->view) {
struct sway_view *view = child->view; struct sway_view *view = child->view;
struct border_colors *colors; struct border_colors *colors;