Consider floating views when calculating title height

This commit is contained in:
Ryan Dwyer 2018-05-30 10:27:16 +10:00
parent 9119f87655
commit c9f8d35ca9

View file

@ -26,6 +26,7 @@
#include "sway/config.h" #include "sway/config.h"
#include "sway/tree/arrange.h" #include "sway/tree/arrange.h"
#include "sway/tree/layout.h" #include "sway/tree/layout.h"
#include "sway/tree/workspace.h"
#include "cairo.h" #include "cairo.h"
#include "pango.h" #include "pango.h"
#include "readline.h" #include "readline.h"
@ -751,6 +752,16 @@ void config_update_font_height(bool recalculate) {
container_for_each_descendant_dfs(&root_container, container_for_each_descendant_dfs(&root_container,
find_font_height_iterator, &recalculate); find_font_height_iterator, &recalculate);
// Also consider floating views
for (int i = 0; i < root_container.children->length; ++i) {
struct sway_container *output = root_container.children->items[i];
for (int j = 0; j < output->children->length; ++j) {
struct sway_container *ws = output->children->items[i];
container_for_each_descendant_dfs(ws->sway_workspace->floating,
find_font_height_iterator, &recalculate);
}
}
if (config->font_height != prev_max_height) { if (config->font_height != prev_max_height) {
arrange_root(); arrange_root();
} }