From 55b88129a1601c4b475ce9f56c3db092652b168e Mon Sep 17 00:00:00 2001
From: fallenoak <git@fallenoak.me>
Date: Thu, 20 Nov 2025 16:32:07 -0600
Subject: [PATCH] fix(ui): correct input event processing in CSimpleTop

---
 src/ui/CSimpleTop.cpp | 28 ++++++++++++++--------------
 src/ui/CSimpleTop.hpp |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/ui/CSimpleTop.cpp b/src/ui/CSimpleTop.cpp
index 50e7911..284c8e7 100644
--- a/src/ui/CSimpleTop.cpp
+++ b/src/ui/CSimpleTop.cpp
@@ -28,15 +28,15 @@ int32_t CSimpleTop::OnChar(const EVENT_DATA_CHAR* pCharData, void* param) {
     charEvent = *pCharData;
     charEvent.id = 0x40060067;
 
-    for (int32_t strata = FRAME_STRATA_TOOLTIP; strata >= FRAME_STRATA_WORLD; strata--) {
+    for (int32_t strata = NUM_FRAME_STRATA - 1; strata >= 0; strata--) {
         if (eaten) {
             break;
         }
 
-        auto priorities = &top->m_eventqueue[strata][SIMPLE_EVENT_CHAR];
+        auto& queue = top->m_eventqueue[SIMPLE_EVENT_CHAR][strata];
 
-        for (uint32_t i = 0; i < priorities->Count(); i++) {
-            auto priority = priorities->operator[](i);
+        for (uint32_t i = 0; i < queue.Count(); i++) {
+            auto priority = queue[i];
 
             if (!priority || eaten) {
                 break;
@@ -96,15 +96,15 @@ int32_t CSimpleTop::OnKeyDown(const EVENT_DATA_KEY* pKeyData, void* param) {
 
     int32_t eaten = 0;
 
-    for (int32_t strata = FRAME_STRATA_TOOLTIP; strata >= FRAME_STRATA_WORLD; strata--) {
+    for (int32_t strata = NUM_FRAME_STRATA - 1; strata >= 0; strata--) {
         if (eaten) {
             break;
         }
 
-        auto priorities = &top->m_eventqueue[strata][SIMPLE_EVENT_KEY];
+        auto& queue = top->m_eventqueue[SIMPLE_EVENT_KEY][strata];
 
-        for (uint32_t i = 0; i < priorities->Count(); i++) {
-            auto priority = priorities->operator[](i);
+        for (uint32_t i = 0; i < queue.Count(); i++) {
+            auto priority = queue[i];
 
             if (!priority || eaten) {
                 break;
@@ -265,11 +265,11 @@ int32_t CSimpleTop::OnMouseMove(const EVENT_DATA_MOUSE* pMouseData, void* param)
         mouseCapture->OnLayerTrackUpdate(mouseEvent);
     }
 
-    for (int32_t strata = FRAME_STRATA_DIALOG; strata >= FRAME_STRATA_WORLD; strata--) {
-        auto priorities = &top->m_eventqueue[strata][SIMPLE_EVENT_MOUSE];
+    for (int32_t strata = NUM_FRAME_STRATA - 1; strata >= 0; strata--) {
+        auto& queue = top->m_eventqueue[SIMPLE_EVENT_MOUSE][strata];
 
-        for (int32_t i = 0; i < priorities->Count(); i++) {
-            auto priority = priorities->operator[](i);
+        for (int32_t i = 0; i < queue.Count(); i++) {
+            auto priority = queue[i];
             auto frame = priority->frame;
 
             if (frame->OnLayerTrackUpdate(mouseEvent)) {
@@ -538,7 +538,7 @@ int32_t CSimpleTop::RaiseFrame(CSimpleFrame* frame, int32_t checkOcclusion) {
 }
 
 void CSimpleTop::RegisterForEvent(CSimpleFrame* frame, CSimpleEventType event, int32_t a4, uint32_t priority) {
-    auto& queue = this->m_eventqueue[frame->m_strata][event];
+    auto& queue = this->m_eventqueue[event][frame->m_strata];
 
     auto m = SMemAlloc(sizeof(FRAMEPRIORITY), __FILE__, __LINE__, 0x0);
     auto framePriority = new (m) FRAMEPRIORITY();
@@ -578,7 +578,7 @@ int32_t CSimpleTop::StartMoveOrResizeFrame(CSimpleFrame* frame, MOVERESIZE_REASO
 }
 
 void CSimpleTop::UnregisterForEvent(CSimpleFrame* frame, CSimpleEventType event, int32_t a4) {
-    auto& queue = this->m_eventqueue[frame->m_strata][event];
+    auto& queue = this->m_eventqueue[event][frame->m_strata];
 
     int32_t found = 0;
 
diff --git a/src/ui/CSimpleTop.hpp b/src/ui/CSimpleTop.hpp
index ea537aa..936252d 100644
--- a/src/ui/CSimpleTop.hpp
+++ b/src/ui/CSimpleTop.hpp
@@ -54,7 +54,7 @@ class CSimpleTop : public CLayoutFrame {
         STORM_EXPLICIT_LIST(CSimpleFrame, m_destroyedLink) m_destroyed;
         CFrameStrata* m_strata[NUM_FRAME_STRATA];
         frame_layout m_layout;
-        CSimpleSortedArray<FRAMEPRIORITY*> m_eventqueue[NUM_FRAME_STRATA][NUM_SIMPLE_EVENTS];
+        CSimpleSortedArray<FRAMEPRIORITY*> m_eventqueue[NUM_SIMPLE_EVENTS][NUM_FRAME_STRATA];
         int32_t m_checkFocus = 1;
         EVENT_DATA_MOUSE m_mousePosition;
         int32_t (*m_mouseButtonCallback)(CMouseEvent*) = nullptr;