From d072c852f37ca40aad9e8f0455a2e92cb38f7f3d Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Thu, 12 Mar 2026 00:10:54 -0700
Subject: [PATCH] Add AFK/DND toggles to player frame menu and right-click
 context to pet frame

---
 src/ui/game_screen.cpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/ui/game_screen.cpp b/src/ui/game_screen.cpp
index aa044474..1cfab9a7 100644
--- a/src/ui/game_screen.cpp
+++ b/src/ui/game_screen.cpp
@@ -2094,6 +2094,15 @@ void GameScreen::renderPlayerFrame(game::GameHandler& gameHandler) {
             if (ImGui::MenuItem("Toggle PvP")) {
                 gameHandler.togglePvp();
             }
+            ImGui::Separator();
+            bool afk = gameHandler.isAfk();
+            bool dnd = gameHandler.isDnd();
+            if (ImGui::MenuItem(afk ? "Cancel AFK" : "Set AFK")) {
+                gameHandler.toggleAfk();
+            }
+            if (ImGui::MenuItem(dnd ? "Cancel DND" : "Set DND")) {
+                gameHandler.toggleDnd();
+            }
             if (gameHandler.isInGroup()) {
                 ImGui::Separator();
                 if (ImGui::MenuItem("Leave Group")) {
@@ -2295,6 +2304,18 @@ void GameScreen::renderPetFrame(game::GameHandler& gameHandler) {
         if (ImGui::Selectable(petLabel, false, 0, ImVec2(0, 0))) {
             gameHandler.setTarget(petGuid);
         }
+        // Right-click context menu on pet name
+        if (ImGui::BeginPopupContextItem("PetNameCtx")) {
+            ImGui::TextDisabled("%s", petLabel);
+            ImGui::Separator();
+            if (ImGui::MenuItem("Target Pet")) {
+                gameHandler.setTarget(petGuid);
+            }
+            if (ImGui::MenuItem("Dismiss Pet")) {
+                gameHandler.dismissPet();
+            }
+            ImGui::EndPopup();
+        }
         ImGui::PopStyleColor();
         if (petLevel > 0) {
             ImGui::SameLine();