From e64f9f4585a57d636e0cef26f49f1b9ee4d94d44 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Sat, 21 Mar 2026 03:24:23 -0700
Subject: [PATCH] fix: add mail, auction, quest, and trade windows to Escape
 key chain

The Escape key now properly closes these windows before showing the
escape menu:
- Mail window (closeMailbox)
- Auction house (closeAuctionHouse)
- Quest details dialog (declineQuest)
- Quest offer reward dialog (closeQuestOfferReward)
- Quest request items dialog (closeQuestRequestItems)
- Trade window (cancelTrade)

Previously these windows required clicking their close button since
Escape would skip directly to the escape menu.
---
 src/ui/game_screen.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/ui/game_screen.cpp b/src/ui/game_screen.cpp
index 18d0a6ec..2884d85d 100644
--- a/src/ui/game_screen.cpp
+++ b/src/ui/game_screen.cpp
@@ -2787,6 +2787,18 @@ void GameScreen::processTargetInput(game::GameHandler& gameHandler) {
                 gameHandler.closeBank();
             } else if (gameHandler.isTrainerWindowOpen()) {
                 gameHandler.closeTrainer();
+            } else if (gameHandler.isMailboxOpen()) {
+                gameHandler.closeMailbox();
+            } else if (gameHandler.isAuctionHouseOpen()) {
+                gameHandler.closeAuctionHouse();
+            } else if (gameHandler.isQuestDetailsOpen()) {
+                gameHandler.declineQuest();
+            } else if (gameHandler.isQuestOfferRewardOpen()) {
+                gameHandler.closeQuestOfferReward();
+            } else if (gameHandler.isQuestRequestItemsOpen()) {
+                gameHandler.closeQuestRequestItems();
+            } else if (gameHandler.isTradeOpen()) {
+                gameHandler.cancelTrade();
             } else if (showWhoWindow_) {
                 showWhoWindow_ = false;
             } else if (showCombatLog_) {