aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-04-06 09:43:12 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2018-04-06 09:43:44 -0400
commitd77a0119f46ab977beca6725efed38fcb5f9e434 (patch)
tree27b0d5f9ff6958377aa4b8904516ed6df399fb77
parentFix focus_follows_mouse issues (diff)
downloadsway-d77a0119f46ab977beca6725efed38fcb5f9e434.tar.gz
sway-d77a0119f46ab977beca6725efed38fcb5f9e434.tar.zst
sway-d77a0119f46ab977beca6725efed38fcb5f9e434.zip
Avoid arranging windows while reloading config
-rw-r--r--sway/tree/layout.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 65fd5d4a..343f349a 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -228,6 +228,9 @@ static void apply_vert_layout(struct sway_container *container, const double x,
228 228
229void arrange_windows(struct sway_container *container, 229void arrange_windows(struct sway_container *container,
230 double width, double height) { 230 double width, double height) {
231 if (config->reloading) {
232 return;
233 }
231 int i; 234 int i;
232 if (width == -1 || height == -1) { 235 if (width == -1 || height == -1) {
233 width = container->width; 236 width = container->width;
@@ -246,7 +249,6 @@ void arrange_windows(struct sway_container *container,
246 double x = 0, y = 0; 249 double x = 0, y = 0;
247 switch (container->type) { 250 switch (container->type) {
248 case C_ROOT: 251 case C_ROOT:
249 // TODO: wlr_output_layout probably
250 for (i = 0; i < container->children->length; ++i) { 252 for (i = 0; i < container->children->length; ++i) {
251 struct sway_container *output = container->children->items[i]; 253 struct sway_container *output = container->children->items[i];
252 wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f", 254 wlr_log(L_DEBUG, "Arranging output '%s' at %f,%f",