From 212c35691f822cb2f7518ba2678fa2d14b6da60f Mon Sep 17 00:00:00 2001
From: Terry Truong <terry06890@gmail.com>
Date: Fri, 24 Jun 2022 23:59:18 +1000
Subject: Fix bad-layout after click-and-hold during tutorial

---
 src/App.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/App.vue')

diff --git a/src/App.vue b/src/App.vue
index effaded..877ad2c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -294,12 +294,11 @@ export default defineComponent({
 			// Function for expanding tile
 			let doExpansion = () => {
 				LayoutNode.hideUpward(layoutNode, this.layoutMap);
-				this.activeRoot = layoutNode;
 				if (this.detachedAncestors == null){
-					// Repeatedly relayout tiles during ancestry-bar transition
 					this.ancestryBarInTransition = true;
 					this.relayoutDuringAncestryBarTransition();
 				}
+				this.activeRoot = layoutNode;
 				//
 				return this.updateAreaDims().then(() => {
 					this.overflownRoot = false;
@@ -350,12 +349,11 @@ export default defineComponent({
 				return;
 			}
 			LayoutNode.hideUpward(layoutNode, this.layoutMap);
-			this.activeRoot = layoutNode;
-			// Repeatedly relayout tiles during ancestry-bar transition
 			if (this.detachedAncestors == null){
 				this.ancestryBarInTransition = true;
 				this.relayoutDuringAncestryBarTransition();
 			}
+			this.activeRoot = layoutNode;
 			//
 			this.updateAreaDims().then(() => this.relayoutWithCollapse());
 		},
@@ -367,7 +365,6 @@ export default defineComponent({
 			this.setLastFocused(null);
 			this.activeRoot = layoutNode;
 			this.overflownRoot = false;
-			// Repeatedly relayout tiles during ancestry-bar transition
 			if (layoutNode.parent == null){
 				this.ancestryBarInTransition = true;
 				this.relayoutDuringAncestryBarTransition();
-- 
cgit v1.2.3

