Cleanup: Reduce context usage in UI functions

Part of https://developer.blender.org/T74429.

There's a chance that this causes some issues becaue in some cases we
change from getting the window from context to getting it from somewhere
else.

1 files changed, 7 insertions, 11 deletions

diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c
index 560c6146afe..2b6125fc193 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.c
+++ b/source/blender/editors/interface/interface_region_menu_popup.c
@@ -357,7 +357,7 @@ uiPopupBlockHandle *ui_popup_menu_create(
     handle->popup = true;
 
     UI_popup_handlers_add(C, &window->modalhandlers, handle, 0);
-    WM_event_add_mousemove(C);
+    WM_event_add_mousemove(window);
   }
 
   MEM_freeN(pup);
@@ -467,7 +467,7 @@ void UI_popup_menu_end(bContext *C, uiPopupMenu *pup)
   menu->popup = true;
 
   UI_popup_handlers_add(C, &window->modalhandlers, menu, 0);
-  WM_event_add_mousemove(C);
+  WM_event_add_mousemove(window);
 
   MEM_freeN(pup);
 }
@@ -599,7 +599,7 @@ void UI_popup_block_invoke_ex(bContext *C,
 
   UI_popup_handlers_add(C, &window->modalhandlers, handle, 0);
   UI_block_active_only_flagged_buttons(C, handle->region, handle->region->uiblocks.first);
-  WM_event_add_mousemove(C);
+  WM_event_add_mousemove(window);
 }
 
 void UI_popup_block_invoke(bContext *C,
@@ -633,7 +633,7 @@ void UI_popup_block_ex(bContext *C,
 
   UI_popup_handlers_add(C, &window->modalhandlers, handle, 0);
   UI_block_active_only_flagged_buttons(C, handle->region, handle->region->uiblocks.first);
-  WM_event_add_mousemove(C);
+  WM_event_add_mousemove(window);
 }
 
 #if 0 /* UNUSED */
@@ -676,14 +676,10 @@ void UI_popup_block_close(bContext *C, wmWindow *win, uiBlock *block)
   }
 }
 
-bool UI_popup_block_name_exists(bContext *C, const char *name)
+bool UI_popup_block_name_exists(const bScreen *screen, const char *name)
 {
-  bScreen *sc = CTX_wm_screen(C);
-  uiBlock *block;
-  ARegion *ar;
-
-  for (ar = sc->regionbase.first; ar; ar = ar->next) {
-    for (block = ar->uiblocks.first; block; block = block->next) {
+  for (const ARegion *ar = screen->regionbase.first; ar; ar = ar->next) {
+    for (const uiBlock *block = ar->uiblocks.first; block; block = block->next) {
       if (STREQ(block->name, name)) {
         return true;
       }