summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2016-05-09 07:02:25 -0700
committerLibravatar Drew DeVault <sir@cmpwn.com>2016-05-09 07:02:25 -0700
commit8ee764e0c24378fe3d8e430bdbb40ea58ac9c28d (patch)
treecaf0a66e51fddadc5a1346766d04740cc064c204
parentMerge pull request #648 from Hummer12007/relative_wallpaper (diff)
parentPrevent changing layout when focusing float window (diff)
downloadsway-8ee764e0c24378fe3d8e430bdbb40ea58ac9c28d.tar.gz
sway-8ee764e0c24378fe3d8e430bdbb40ea58ac9c28d.tar.zst
sway-8ee764e0c24378fe3d8e430bdbb40ea58ac9c28d.zip
Merge pull request #649 from mikkeloscar/floating-layout
Prevent changing layout when focusing float window
-rw-r--r--sway/commands.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands.c b/sway/commands.c
index 83f09788..22621453 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -1831,6 +1831,10 @@ static struct cmd_results *cmd_layout(int argc, char **argv) {
1831 return error; 1831 return error;
1832 } 1832 }
1833 swayc_t *parent = get_focused_container(&root_container); 1833 swayc_t *parent = get_focused_container(&root_container);
1834 if (parent->is_floating) {
1835 return cmd_results_new(CMD_FAILURE, "layout", "Unable to change layout of floating windows");
1836 }
1837
1834 while (parent->type == C_VIEW) { 1838 while (parent->type == C_VIEW) {
1835 parent = parent->parent; 1839 parent = parent->parent;
1836 } 1840 }