From d17a306a94127b8ac971c03aa41bf709dd50d428 Mon Sep 17 00:00:00 2001
From: bakkeby <bakkeby@gmail.com>
Date: Tue, 24 Mar 2020 10:17:09 +0100
Subject: [PATCH] Removing workaround to ensure that floating master stays on
 top, ref. #20

---
 patch/centeredfloatingmaster.c |  7 +------
 patch/flextile-deluxe.c        | 18 +-----------------
 patch/flextile-deluxe.h        |  3 +--
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/patch/centeredfloatingmaster.c b/patch/centeredfloatingmaster.c
index 80168ef..756b41f 100644
--- a/patch/centeredfloatingmaster.c
+++ b/patch/centeredfloatingmaster.c
@@ -78,10 +78,6 @@ centeredfloatingmaster(Monitor *m)
 			#else
 			mx += WIDTH(c);
 			#endif
-			if (n > 1) {
-				detachstack(c);
-				attachstack(c);
-			}
 		} else {
 			/* stack clients are stacked horizontally */
 			#if CFACTS_PATCH
@@ -95,5 +91,4 @@ centeredfloatingmaster(Monitor *m)
 			sx += WIDTH(c);
 			#endif
 		}
-	restack(m);
-}
\ No newline at end of file
+}
diff --git a/patch/flextile-deluxe.c b/patch/flextile-deluxe.c
index 2b579e7..8105b47 100644
--- a/patch/flextile-deluxe.c
+++ b/patch/flextile-deluxe.c
@@ -1,4 +1,4 @@
-atypedef struct {
+typedef struct {
 	void (*arrange)(Monitor *, int, int, int, int, int, int, int);
 } LayoutArranger;
 
@@ -316,9 +316,6 @@ layout_floating_master_fixed(Monitor *m, int x, int y, int h, int w, int ih, int
 	y = y + (h - mh) / 2;
 
 	(&flextiles[m->ltaxis[MASTER]])->arrange(m, x, y, mh, mw, ih, iv, n, m->nmaster, 0);
-	if (n > 1)
-		reattachstack(m, m->nmaster, 0);
-	restack(m);
 }
 
 static void
@@ -669,16 +666,3 @@ incnstack(const Arg *arg)
 	#endif // PERTAG_PATCH
 	arrange(selmon);
 }
-
-void
-reattachstack(Monitor *m, int an, int ai)
-{
-	unsigned int i;
-	Client *c;
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-		if (i >= ai && i < (ai + an)) {
-			detachstack(c);
-			attachstack(c);
-		}
-}
diff --git a/patch/flextile-deluxe.h b/patch/flextile-deluxe.h
index b568b97..db78483 100644
--- a/patch/flextile-deluxe.h
+++ b/patch/flextile-deluxe.h
@@ -2,7 +2,6 @@ static void flextile(Monitor *m);
 static void mirrorlayout(const Arg *arg);
 static void rotatelayoutaxis(const Arg *arg);
 static void incnstack(const Arg *arg);
-static void reattachstack(Monitor *m, int ai, int an);
 
 /* Symbol handlers */
 static void setflexsymbols(Monitor *m, unsigned int n);
@@ -105,4 +104,4 @@ static char tilesymb[] = {
 	35,  // "#",
 	92,  // "\\",
 	64,  // "@",
-};
\ No newline at end of file
+};