refac: Moved focusedItem and activeWindow to mvContext.

hoffstadt · Jan 31, 2024 · 003efa9 · 003efa9
1 parent e085503
commit 003efa9
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 17 deletions.
diff --git a/src/dearpygui_commands.h b/src/dearpygui_commands.h
@@ -2988,15 +2988,15 @@ get_active_window(PyObject* self, PyObject* args, PyObject* kwargs)
 {
 	 std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
-	return ToPyUUID(GContext->itemRegistry->activeWindow);
+	return ToPyUUID(GContext->activeWindow);
 }
 
 static PyObject*
 get_focused_item(PyObject* self, PyObject* args, PyObject* kwargs)
 {
 	 std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
-	return ToPyUUID(GContext->itemRegistry->focusedItem);
+	return ToPyUUID(GContext->focusedItem);
 }
 
 static PyObject*

diff --git a/src/mvAppItemState.cpp b/src/mvAppItemState.cpp
@@ -1,7 +1,6 @@
 #include "mvAppItemState.h"
 #include <imgui.h>
 #include "mvAppItem.h"
-#include "mvItemRegistry.h"
 #include "mvContext.h"
 #include "mvPyUtils.h"
 
@@ -33,7 +32,7 @@ UpdateAppItemState(mvAppItemState& state)
     state.focused = ImGui::IsItemFocused();
     if (state.focused)
     {
-        GContext->itemRegistry->focusedItem = state.parent->uuid;
+        GContext->focusedItem = state.parent->uuid;
     }
     state.leftclicked = ImGui::IsItemClicked();
     state.rightclicked = ImGui::IsItemClicked(1);

diff --git a/src/mvContainers.cpp b/src/mvContainers.cpp
@@ -668,8 +668,7 @@ DearPyGui::draw_menu(ImDrawList* drawlist, mvAppItem& item, mvMenuConfig& config
                 GContext->input.mousePos.y = (int)y;
 
 
-                if (GContext->itemRegistry->activeWindow != item.uuid)
-                    GContext->itemRegistry->activeWindow = item.uuid;
+                GContext->activeWindow = item.uuid;
 
             }
 
@@ -977,8 +976,7 @@ DearPyGui::draw_child_window(ImDrawList* drawlist, mvAppItem& item, mvChildWindo
             GContext->input.mousePos.x = (int)x;
             GContext->input.mousePos.y = (int)y;
 
-            if (GContext->itemRegistry->activeWindow != item.uuid)
-                GContext->itemRegistry->activeWindow = item.uuid;
+            GContext->activeWindow = item.uuid;
 
         }
 
@@ -1656,8 +1654,7 @@ DearPyGui::draw_window(ImDrawList* drawlist, mvAppItem& item, mvWindowAppItemCon
         GContext->input.mousePos.x = (int)x;
         GContext->input.mousePos.y = (int)y;
 
-        if (GContext->itemRegistry->activeWindow != item.uuid)
-            GContext->itemRegistry->activeWindow = item.uuid;
+        GContext->activeWindow = item.uuid;
 
     }
 

diff --git a/src/mvContext.h b/src/mvContext.h
@@ -119,6 +119,8 @@ struct mvContext
     mvItemRegistry*     itemRegistry = nullptr;
     mvCallbackRegistry* callbackRegistry = nullptr;
     mvInput             input;
+    mvUUID              activeWindow = 0;
+    mvUUID              focusedItem = 0;
 
 };
 

diff --git a/src/mvItemRegistry.h b/src/mvItemRegistry.h
@@ -78,8 +78,6 @@ struct mvItemRegistry
     // misc
     std::stack<mvAppItem*>                  containers;      // parent stack, top of stack becomes widget's parent
     std::unordered_map<std::string, mvUUID> aliases;
-    mvUUID                                  activeWindow = 0;
-    mvUUID                                  focusedItem = 0;
     std::vector<mvAppItem*>                 delayedSearch;
     b8                                      showImGuiDebug = false;
     b8                                      showImPlotDebug = false;

diff --git a/src/mvPlotting.cpp b/src/mvPlotting.cpp
@@ -531,9 +531,7 @@ DearPyGui::draw_plot(ImDrawList* drawlist, mvAppItem& item, mvPlotConfig& config
 			GContext->input.mousePos.x = (int)x;
 			GContext->input.mousePos.y = (int)y;
 
-
-			if (GContext->itemRegistry->activeWindow != item.uuid)
-				GContext->itemRegistry->activeWindow = item.uuid;
+			GContext->activeWindow = item.uuid;
 
 		}
 

diff --git a/src/mvToolWindow.cpp b/src/mvToolWindow.cpp
@@ -40,8 +40,7 @@ void mvToolWindow::draw()
 
         std::lock_guard<std::recursive_mutex> lk(GContext->mutex);
 
-        if (GContext->itemRegistry->activeWindow != getUUID())
-            GContext->itemRegistry->activeWindow = getUUID();
+        GContext->activeWindow = getUUID();
 
     }