From d91a6ee11ee2436cc477b1e47616291ef57af70f Mon Sep 17 00:00:00 2001
From: Bertie690 <136088738+Bertie690@users.noreply.github.com>
Date: Fri, 13 Jun 2025 21:38:54 -0400
Subject: [PATCH 1/2] [Github] Update `pull_request_template.md` with more
 labels

https://github.com/pagefaultgames/pokerogue/pull/5974

* Update pull_request_template.md with more labels

More better

* Fix create test script name post refactor

Forgot to change it earlier
---
 .github/pull_request_template.md | 37 +++++++++++++++++---------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a25a2f807f3..c7d8b1e4d9c 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,25 +2,28 @@
 <!-- Feel free to look at other PRs for examples -->
 <!--
 Make sure the title includes categorization (choose the one that best fits):
--       [Bug]: If the PR is primarily a bug fix
--      [Move]: If a move has new or changed functionality
--   [Ability]: If an ability has new or changed functionality
--      [Item]: For new or modified items
--   [Mystery]: For new or modified Mystery Encounters
--      [Test]: If the PR is primarily adding or modifying tests
--     [UI/UX]: If the PR is changing UI/UX elements
--     [Audio]: If the PR is adding or changing music/sfx
--    [Sprite]: If the PR is adding or changing sprites
--   [Balance]: If the PR is related to game balance
-- [Challenge]: If the PR is adding or modifying challenges
+-  [Bug]: If the PR is primarily a bug fix
+-  [Move]: If a move has new or changed functionality
+-  [Ability]: If an ability has new or changed functionality
+-  [Item]: For new or modified items
+-  [Mystery]: For new or modified Mystery Encounters
+-  [Test]: If the PR is primarily adding or modifying tests
+-  [UI/UX]: If the PR is changing UI/UX elements
+-  [Audio]: If the PR is adding or changing music/sfx
+-  [Sprite]: If the PR is adding or changing sprites
+-  [Balance]: If the PR is related to game balance
+-  [Challenge]: If the PR is adding or modifying challenges
 -  [Refactor]: If the PR is primarily rewriting existing code
--      [Docs]: If the PR is just adding or modifying documentation (such as tsdocs/code comments)
--    [GitHub]: For changes to GitHub workflows/templates/etc
--      [Misc]: If no other category fits the PR
+-  [Dev]: If the PR is primarily changing something pertaining to development (lefthook hooks, linter rules, etc.)
+-  [i18n]: If the PR is primarily adding/changing locale keys or key usage (may come with an associated locales PR)
+-  [Docs]: If the PR is adding or modifying documentation (such as tsdocs/code comments)
+-  [GitHub]: For changes to GitHub workflows/templates/etc
+-  [Misc]: If no other category fits the PR
 -->
+
 <!--
 Make sure that this PR is not overlapping with someone else's work
-Please try to keep the PR self-contained (and small)
+Please try to keep the PR self-contained (and small!)
 -->
 
 ## What are the changes the user will see?
@@ -66,11 +69,11 @@ Do the reviewers need to do something special in order to test your changes?
 - [ ] Have I provided a clear explanation of the changes?
 - [ ] Have I tested the changes manually?
 - [ ] Are all unit tests still passing? (`npm run test:silent`)
-  - [ ] Have I created new automated tests (`npm run create-test`) or updated existing tests related to the PR's changes?
+  - [ ] Have I created new automated tests (`npm run test:create`) or updated existing tests related to the PR's changes?
 - [ ] Have I provided screenshots/videos of the changes (if applicable)?
   - [ ] Have I made sure that any UI change works for both UI themes (default and legacy)?
 
 Are there any localization additions or changes? If so:
 - [ ] Has a locales PR been created on the [locales](https://github.com/pagefaultgames/pokerogue-locales) repo?
   - [ ] If so, please leave a link to it here: 
-- [ ] Has the translation team been contacted for proofreading/translation?
\ No newline at end of file
+- [ ] Has the translation team been contacted for proofreading/translation?

From 9a525ac8fd89743e9c8d4c8f4c96d369af5a9763 Mon Sep 17 00:00:00 2001
From: fabske0 <192151969+fabske0@users.noreply.github.com>
Date: Sat, 14 Jun 2025 05:19:05 +0200
Subject: [PATCH 2/2] [UI/UX] Position setting Icons dynamically (#5969)

* position setting icons dynamically

* add comment for potential overlap
---
 src/ui/settings/abstract-control-settings-ui-handler.ts | 9 +++++++--
 src/ui/settings/abstract-settings-ui-handler.ts         | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/ui/settings/abstract-control-settings-ui-handler.ts b/src/ui/settings/abstract-control-settings-ui-handler.ts
index 495a0f68540..e3631c062df 100644
--- a/src/ui/settings/abstract-control-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-control-settings-ui-handler.ts
@@ -126,6 +126,11 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
     );
     this.actionsBg.setOrigin(0, 0);
 
+    /*
+     * If there isn't enough space to fit all the icons and texts, there will be an overlap
+     * This currently doesn't happen, but it's something to keep in mind.
+     */
+
     const iconAction = globalScene.add.sprite(0, 0, "keyboard");
     iconAction.setOrigin(0, -0.1);
     iconAction.setPositionRelative(this.actionsBg, this.navigationContainer.width - 32, 4);
@@ -137,7 +142,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
 
     const iconCancel = globalScene.add.sprite(0, 0, "keyboard");
     iconCancel.setOrigin(0, -0.1);
-    iconCancel.setPositionRelative(this.actionsBg, this.navigationContainer.width - 100, 4);
+    iconCancel.setPositionRelative(this.actionsBg, actionText.x - 28, 4);
     this.navigationIcons["BUTTON_CANCEL"] = iconCancel;
 
     const cancelText = addTextObject(0, 0, i18next.t("settings:back"), TextStyle.SETTINGS_LABEL);
@@ -146,7 +151,7 @@ export default abstract class AbstractControlSettingsUiHandler extends UiHandler
 
     const iconReset = globalScene.add.sprite(0, 0, "keyboard");
     iconReset.setOrigin(0, -0.1);
-    iconReset.setPositionRelative(this.actionsBg, this.navigationContainer.width - 180, 4);
+    iconReset.setPositionRelative(this.actionsBg, cancelText.x - 28, 4);
     this.navigationIcons["BUTTON_HOME"] = iconReset;
 
     const resetText = addTextObject(0, 0, i18next.t("settings:reset"), TextStyle.SETTINGS_LABEL);
diff --git a/src/ui/settings/abstract-settings-ui-handler.ts b/src/ui/settings/abstract-settings-ui-handler.ts
index 1fb4b6d34dc..a621b056e28 100644
--- a/src/ui/settings/abstract-settings-ui-handler.ts
+++ b/src/ui/settings/abstract-settings-ui-handler.ts
@@ -94,7 +94,7 @@ export default class AbstractSettingsUiHandler extends MessageUiHandler {
 
     const iconCancel = globalScene.add.sprite(0, 0, "keyboard");
     iconCancel.setOrigin(0, -0.1);
-    iconCancel.setPositionRelative(actionsBg, this.navigationContainer.width - 100, 4);
+    iconCancel.setPositionRelative(actionsBg, actionText.x - 28, 4);
     this.navigationIcons["BUTTON_CANCEL"] = iconCancel;
 
     const cancelText = addTextObject(0, 0, i18next.t("settings:back"), TextStyle.SETTINGS_LABEL);