From e0fec0039e3e9e742fe0d72a58c0f1f29f95087d Mon Sep 17 00:00:00 2001
From: jugeeya <jugeeya@live.com>
Date: Fri, 24 Feb 2023 22:07:35 -0800
Subject: [PATCH] Use our own Menu Title button (#498)

---
 src/static/layout.arc   | Bin 1941688 -> 1941688 bytes
 src/training/ui/menu.rs |  17 ++---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/static/layout.arc b/src/static/layout.arc
index 8d22f2bc50aa5d87dea55989937c2dad815408ec..2db0d62125a382d8b30b7ec85d7f61dd092e89fe 100644
GIT binary patch
delta 540
zcmWm5Pe_vi7{~G7^KNtgS?T7xd^h*PaBGB!If{_*5MAn0gjm#RMjlr_tQ>gS!Sxi9
z5GfIL8RVg&pqS`;TOPWUL=cj<cJWXc2;Mqm&vW~HpNC(tSq(O;kN0W;5#I5WSREkq
zibKdf*yvr-Ha9|qp}BDUskZrTm~d@-JkiiLuSN)eO3xE-w9Ts>`d_&2Hm%jqqJ*9E
zm1IlX%$<bjzt_nx+Ugq0U4&w_<!$T1{H>edFYbG7ZSzVG;r{1B>bJJJ5hH9>M^gvd
z=5qst5AC065Xf9k5!}1GX`Pb!{U9MZUGhC`v+ENkKPIv{ZP%|6_OgVRXDZo~dN7~P
z>uB~xc0$|i9VZ-a_2(~Wn==K%!`4B5Qrq08!%wBZg&W%D@)+U!+4hMUZS%z<;nk1b
z;oI8g`YFQV&acsV?RrFGf4q6eN#Bf2d<AmNrCX2I;+1>FD-ICCA*L#qW@o0B<3Xmm
zzA)r0uU&RGMm(xt6((UvI3yevjtF-MM}<3uyM()idxT@cM}&_G_X_t3$AuHZ{lczr
XQuvtgfUqZ=5>5*b3TM{Y561oj7R!im

delta 518
zcmWmAK}eHf7{Kx8+4i|<tGRER+rGB=+J>aWQV@yo6hfV1$clnsMjpDP4~m08n2<e%
zD2Rdw>mYQ=ASk|cyUl??)NV2I)(-7Z7z}oa4$bE|yf451^YX&WTd5T*wc^G}=}{Np
z9c}to08l*%2<hkLz`C?LhX|=fPjFjWecy#}r*YNXl~(872!9GY=38lX-XrHv?}i<1
z@l6Ba`1*XLDy_DA5WN5QB44G&B}jM?MvK*0Lk8+)A3}1q9cxOfCwmc|eHo1ZmR9Hb
z5bDKjyd$k{hY>zBe^~NXR41Yc;f0nZN2s2TBSfYP$(XeI$U>MpH0`wXkyS!?bphe^
z_`H2Z2I`*|5#G<ev?rw1pHm3kdMI;4T3wf$FRGo)l(hQrGQy|AzrlOb>O>ad+qLGU
z8EN%jS#Q3#h966-$3_uWkAG#KNRJs3yW`HR%X(m($e*N~^@nR8xAt#^%1aim+;;kh
zaxNxhlHJYZVKSI{n7m9rre3B#rZY@_rn5}vm;y}wOhG1-DZ~_JiZBf@MVVquaVCrD
LJX7L;l9iED13QAO

diff --git a/src/training/ui/menu.rs b/src/training/ui/menu.rs
index afdddca..674a119 100644
--- a/src/training/ui/menu.rs
+++ b/src/training/ui/menu.rs
@@ -343,23 +343,10 @@ pub unsafe fn draw(root_pane: &mut Pane) {
     // Update menu display
     // Grabbing lock as read-only, essentially
     let app = &*crate::common::menu::QUICK_MENU_APP.data_ptr();
-
-    if let Some(quit_button) = root_pane.find_pane_by_name_recursive("btn_finish") {
-        // Normally at (-804, 640)
-        // Comes down to (-804, 514)
-        if QUICK_MENU_ACTIVE {
-            quit_button.pos_y = 514.0;
-        }
-
+    if let Some(quit_button) = root_pane.find_pane_by_name_recursive("TrModTitle") {
         for quit_txt_s in &["set_txt_00", "set_txt_01"] {
             if let Some(quit_txt) = quit_button.find_pane_by_name_recursive(quit_txt_s) {
-                quit_txt.as_textbox().set_text_string(if QUICK_MENU_ACTIVE {
-                    "Modpack Menu"
-                } else {
-                    // Awkward. We should get the o.g. translation for non-english games
-                    // Or create our own textbox here so we don't step on their toes.
-                    "Quit Training"
-                });
+                quit_txt.as_textbox().set_text_string("Modpack Menu");
             }
         }
     }