From 2b53cca052fed4506946f4ec07b94449a8247593 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 2 Nov 2023 00:48:23 +0100
Subject: [PATCH] changegroup, opposite: untab

Matches behaviour of sway's `layout toggle split`. Fixes my muscle
memory issues.
---
 src/Hy3Layout.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
index eec358a..9c9c717 100644
--- a/src/Hy3Layout.cpp
+++ b/src/Hy3Layout.cpp
@@ -866,10 +866,14 @@ void Hy3Layout::changeGroupToOppositeOn(Hy3Node& node) {
 
 	auto& group = node.parent->data.as_group;
 
-	if (group.layout == Hy3GroupLayout::Tabbed) return;
-	group.setLayout(
-	    group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH
-	);
+	if (group.layout == Hy3GroupLayout::Tabbed) {
+		group.setLayout(group.previous_nontab_layout);
+	} else {
+		group.setLayout(
+		    group.layout == Hy3GroupLayout::SplitH ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH
+		);
+	}
+
 	node.parent->recalcSizePosRecursive();
 }