From bc73230c1511b63cb32f4c62e2b3c69e0e438445 Mon Sep 17 00:00:00 2001
From: Lubos Lenco <lubos.lenco@gmail.com>
Date: Tue, 11 May 2021 12:56:45 +0200
Subject: [PATCH] Move reset layout button to preferences

---
 Sources/arm/ui/BoxPreferences.hx | 11 ++++++++++-
 Sources/arm/ui/UIMenu.hx         | 13 -------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Sources/arm/ui/BoxPreferences.hx b/Sources/arm/ui/BoxPreferences.hx
index 8b1cdbe9..d615a5a3 100644
--- a/Sources/arm/ui/BoxPreferences.hx
+++ b/Sources/arm/ui/BoxPreferences.hx
@@ -79,7 +79,7 @@ class BoxPreferences {
 				// var gridSnap = ui.check(Id.handle({selected: false}), "Grid Snap");
 
 				ui.endElement();
-				ui.row([0.5]);
+				ui.row([0.5, 0.5]);
 				if (ui.button(tr("Restore"))) {
 					UIMenu.draw(function(ui: Zui) {
 						ui.text(tr("Restore defaults?"), Right, ui.t.HIGHLIGHT_COL);
@@ -111,6 +111,15 @@ class BoxPreferences {
 						}
 					}, 3);
 				}
+				if (ui.button(tr("Reset Layout"))) {
+					UIMenu.draw(function(ui: Zui) {
+						ui.text(tr("Reset layout?"), Right, ui.t.HIGHLIGHT_COL);
+						if (ui.button(tr("Confirm"), Left)) {
+							Config.initLayout();
+							Config.save();
+						}
+					}, 2);
+				}
 			}
 
 			if (ui.tab(htab, tr("Theme"), true)) {
diff --git a/Sources/arm/ui/UIMenu.hx b/Sources/arm/ui/UIMenu.hx
index 1f54e685..fa83700a 100644
--- a/Sources/arm/ui/UIMenu.hx
+++ b/Sources/arm/ui/UIMenu.hx
@@ -34,7 +34,6 @@ class UIMenu {
 	static var changeStarted = false;
 	static var showMenuFirst = true;
 	static var hideMenu = false;
-	static var askToResetLayout = false;
 
 	public static function render(g: kha.graphics2.Graphics) {
 		var ui = App.uiMenu;
@@ -114,7 +113,6 @@ class UIMenu {
 				if (menuButton(ui, tr("Redo {step}", ["step" => stepRedo]), Config.keymap.edit_redo)) History.redo();
 				ui.enabled = true;
 				menuSeparator(ui);
-				if (menuButton(ui, tr("Reset Layout"))) askToResetLayout = true;
 				if (menuButton(ui, tr("Preferences..."), Config.keymap.edit_prefs)) BoxPreferences.show();
 			}
 			else if (menuCategory == MenuViewport) {
@@ -442,17 +440,6 @@ class UIMenu {
 			showMenuFirst = true;
 			menuCommands = null;
 		}
-
-		if (askToResetLayout) {
-			askToResetLayout = false;
-			UIMenu.draw(function(ui: Zui) {
-				ui.text(tr("Reset layout?"), Right, ui.t.HIGHLIGHT_COL);
-				if (ui.button(tr("Confirm"), Left)) {
-					Config.initLayout();
-					Config.save();
-				}
-			}, 2);
-		}
 	}
 
 	public static function draw(commands: Zui->Void = null, elements: Int, x = -1, y = -1) {