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
zcmdmSux!V{vI%eMcQ7(CtSy+t)55^O2x3oRVq{Qm-_GC5z`zJ%FJNY5P%32+oW{Vw
z2x6~cVPpuqY9X|Mfq@akUc$=A@HT#y&?*K7Mi6@m8zVzlbA-rd5TA{aVFo)R!wsh*
z(ftezj39Oa2O|Ufzm=k=85kG~I2h|0ayS_o49oUQTxDQj1hFr0F*3+@eUNy-z`zJ%
zPvK@{Xg#GS`3mG9ZbpU$Jd6xy%Jd{ZgB--e$lxH($guIjeJKV;21XD&N0O02r1+^6
z7b62Bh`m9YkwG*eURHvUff2+Ok!55EIv}K=%*enfB3sYM@J4}=VX;|}f<7YyBZzIH
z!pN{8f3|`RBLgFdEuqTD@c)dkiaR3%BZw`d#>mjI|FcREBLgFdEuhcHa5VmxS|lR_
zBZ!@2z{qgf>VZZI$N>h73?7Dz3@ffb)yidLU<9#Sj2RiaZoJg1WMp7$VKruC_+YU)
zk4Y+#)#e-ngYxFy<en{pMJ0v-ObiUn4F4HIihT1^LM99DklDPgS&3=#7C({gIueX6
zp=||>Z3Rqi1<Y*)ENum>Z3S#?1?+7F9Bl=hZ3SFy1>9`~JZ%NMZ3TR71^jIV0&N9?
rZ3RMY1;T9wB5ehtZ3SX&1>$W55^V*NZ3R+o1=4K=GTRDdcNhQw7R!im

delta 518
zcmdmSux!V{vI%eMGyXF$tSy+t)55^O2x7Z1Ffu5&Z|Co2U|<BX0~i?@luB6yr!g=v
zg4i)kj0|B{Erb>@FffAHA<T>nZ{uePtzuwc1hGR{7#YHvBSbcX_$-VJ9;}QEH=K$@
z_cJgsg4hadj127mR*IfxU|>{WW2|S8VP|A8EZZ+}m4Sf~#BShVWRUIpAn|~Kff2-Z
z;bdfJJ*6i33gjS8Muq?`MuszGdXk?(4&q{D_#nc_u<^ltDF#LcMi5&@oRLAK_^A{Z
zBLgFdogm4`Aes;_E5XRX2x1?RVq^$9Af%wo$iR3+s-BTyjvOPyVzVLzeMSaG5c`QD
zBg2OL*$Os{42&T52_;5`|7V0%+!+}dLF_Zij0_$7KdS^WGBASJ2Xq)2j>i8|i)3VA
z1hHlG7#S{GJ<v!2IY5t*;fEe0!;0%qwQ?C57(r|kLq>+K8!z=L85tN&SPdB&7MN|$
zW0Fc_eRG<DL1}Yua?h5@Tm6K$*GMt8gl-nl3}9+2U~DU3YAaxFD`06WU~Ma4Yb#)H
zE8u7=;A|`4YAfJwE8uA>;B715Yb)SyD-dWa5Ns<DYAX<KD-dZb5N#_EYby|ME0Aa_
UkZdcEYAcX#E0Eb%AiKi=00TRMtN;K2

diff --git a/src/training/ui/menu.rs b/src/training/ui/menu.rs
index afdddca1..674a119a 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");
             }
         }
     }