summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorbakkeby <[email protected]>2020-11-23 15:07:20 +0100
committerbakkeby <[email protected]>2020-11-23 15:07:20 +0100
commite26d50c1107c744b4778785d57d90e02ad9684f7 (patch)
tree994f4dccfa1960778ac89b38563146fc04a1a31f
parent9a760f3ea26495c0c58d1a403f9fbff631adbb4d (diff)
downloaddwm-flexipatch-e26d50c1107c744b4778785d57d90e02ad9684f7.tar.gz
dwm-flexipatch-e26d50c1107c744b4778785d57d90e02ad9684f7.zip
flextile: allow nmaster of 0 to fall back to stack arrangement rather than master, ref. #81
-rw-r--r--config.def.h8
-rw-r--r--patch/layout_flextile-deluxe.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/config.def.h b/config.def.h
index 3241d1c..b6212d4 100644
--- a/config.def.h
+++ b/config.def.h
@@ -517,16 +517,16 @@ static const Layout layouts[] = {
/* symbol arrange function, { nmaster, nstack, layout, master axis, stack axis, secondary stack axis, symbol func } */
{ "[]=", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, TOP_TO_BOTTOM, 0, NULL } }, // default tile layout
{ "><>", NULL, {0} }, /* no layout function means floating behavior */
- { "[M]", flextile, { -1, -1, NO_SPLIT, MONOCLE, 0, 0, NULL } }, // monocle
+ { "[M]", flextile, { -1, -1, NO_SPLIT, MONOCLE, MONOCLE, 0, NULL } }, // monocle
{ "|||", flextile, { -1, -1, SPLIT_VERTICAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // columns (col) layout
{ ">M>", flextile, { -1, -1, FLOATING_MASTER, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // floating master
{ "[D]", flextile, { -1, -1, SPLIT_VERTICAL, TOP_TO_BOTTOM, MONOCLE, 0, NULL } }, // deck
{ "TTT", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, LEFT_TO_RIGHT, 0, NULL } }, // bstack
{ "===", flextile, { -1, -1, SPLIT_HORIZONTAL, LEFT_TO_RIGHT, TOP_TO_BOTTOM, 0, NULL } }, // bstackhoriz
{ "|M|", flextile, { -1, -1, SPLIT_CENTERED_VERTICAL, TOP_TO_BOTTOM, TOP_TO_BOTTOM, TOP_TO_BOTTOM, NULL } }, // centeredmaster
- { ":::", flextile, { -1, -1, NO_SPLIT, GAPPLESSGRID, 0, 0, NULL } }, // gappless grid
- { "[\\]", flextile, { -1, -1, NO_SPLIT, DWINDLE, 0, 0, NULL } }, // fibonacci dwindle
- { "(@)", flextile, { -1, -1, NO_SPLIT, SPIRAL, 0, 0, NULL } }, // fibonacci spiral
+ { ":::", flextile, { -1, -1, NO_SPLIT, GAPPLESSGRID, GAPPLESSGRID, 0, NULL } }, // gappless grid
+ { "[\\]", flextile, { -1, -1, NO_SPLIT, DWINDLE, DWINDLE, 0, NULL } }, // fibonacci dwindle
+ { "(@)", flextile, { -1, -1, NO_SPLIT, SPIRAL, SPIRAL, 0, NULL } }, // fibonacci spiral
#if TILE_LAYOUT
{ "[]=", tile, {0} },
#endif
diff --git a/patch/layout_flextile-deluxe.c b/patch/layout_flextile-deluxe.c
index a23a3c0..96bc04b 100644
--- a/patch/layout_flextile-deluxe.c
+++ b/patch/layout_flextile-deluxe.c
@@ -90,7 +90,7 @@ setlayoutaxisex(const Arg *arg)
static void
layout_no_split(Monitor *m, int x, int y, int h, int w, int ih, int iv, int n)
{
- (&flextiles[m->ltaxis[MASTER]])->arrange(m, x, y, h, w, ih, iv, n, n, 0);
+ (&flextiles[m->ltaxis[m->nmaster >= n ? MASTER : STACK]])->arrange(m, x, y, h, w, ih, iv, n, n, 0);
}
static void