From 50e10498c9b7f609e77b983b36125e3bfcafeaa4 Mon Sep 17 00:00:00 2001
From: Pihkaal <hello@pihkaal.me>
Date: Sun, 18 Jan 2026 23:53:59 +0100
Subject: [PATCH] fix(settings): wrong submenus drawing order

---
 .../Settings/BottomScreen/Menus/Options/Menu.vue       | 10 +++++-----
 .../Settings/BottomScreen/Menus/User/Menu.vue          | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/components/Settings/BottomScreen/Menus/Options/Menu.vue b/app/components/Settings/BottomScreen/Menus/Options/Menu.vue
index d7a1cea..a119aaa 100644
--- a/app/components/Settings/BottomScreen/Menus/Options/Menu.vue
+++ b/app/components/Settings/BottomScreen/Menus/Options/Menu.vue
@@ -33,11 +33,6 @@ onRender((ctx) => {
   ctx.translate(props.x, props.y);
 
   if (isOpen.value || animation.playing) {
-    assets.images.settings.topScreen.options.language.draw(
-      ctx,
-      0,
-      -48 + animation.stage1Offset,
-    );
     assets.images.settings.topScreen.options.gbaMode.draw(
       ctx,
       48 - animation.stage2Offset,
@@ -48,6 +43,11 @@ onRender((ctx) => {
       0,
       -96 + animation.stage2Offset + animation.stage1Offset,
     );
+    assets.images.settings.topScreen.options.language.draw(
+      ctx,
+      0,
+      -48 + animation.stage1Offset,
+    );
 
     assets.images.settings.topScreen.options.optionsActive.draw(ctx, 0, 0);
   } else if (isAnyOtherMenuOpen.value) {
diff --git a/app/components/Settings/BottomScreen/Menus/User/Menu.vue b/app/components/Settings/BottomScreen/Menus/User/Menu.vue
index 3ea3f15..98534c5 100644
--- a/app/components/Settings/BottomScreen/Menus/User/Menu.vue
+++ b/app/components/Settings/BottomScreen/Menus/User/Menu.vue
@@ -38,11 +38,6 @@ onRender((ctx) => {
       -48 + animation.stage2Offset,
       -48 + animation.stage1Offset,
     );
-    assets.images.settings.topScreen.user.userName.draw(
-      ctx,
-      0,
-      -48 + animation.stage1Offset,
-    );
     assets.images.settings.topScreen.user.message.draw(
       ctx,
       48 - animation.stage2Offset,
@@ -53,6 +48,11 @@ onRender((ctx) => {
       0,
       -96 + animation.stage2Offset + animation.stage1Offset,
     );
+    assets.images.settings.topScreen.user.userName.draw(
+      ctx,
+      0,
+      -48 + animation.stage1Offset,
+    );
 
     assets.images.settings.topScreen.user.userActive.draw(ctx, 0, 0);
   } else if (isAnyOtherMenuOpen.value) {