[Bf-blender-cvs] [412179b39bf] master: Cleanup: Rename ED_region_init() -> ED_region_floating_initialize()

Julian Eisel noreply at git.blender.org
Wed Jan 22 16:00:48 CET 2020


Commit: 412179b39bf8741989bb8199ee5f9a1d015fc174
Author: Julian Eisel
Date:   Wed Jan 22 15:54:24 2020 +0100
Branches: master
https://developer.blender.org/rB412179b39bf8741989bb8199ee5f9a1d015fc174

Cleanup: Rename ED_region_init() -> ED_region_floating_initialize()

This function is a very special refresh function just for floating
regions. _initialize is more consistent with ED_area_initialize() so use
that too.

Also adds assert.

===================================================================

M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/interface/interface_region_hud.c
M	source/blender/editors/interface/interface_region_popup.c
M	source/blender/editors/interface/interface_region_search.c
M	source/blender/editors/interface/interface_region_tooltip.c
M	source/blender/editors/screen/area.c

===================================================================

diff --git a/source/blender/editors/include/ED_screen.h b/source/blender/editors/include/ED_screen.h
index 6a801fc9928..9e0272d1402 100644
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@ -69,7 +69,7 @@ void ED_region_exit(struct bContext *C, struct ARegion *ar);
 void ED_region_remove(struct bContext *C, struct ScrArea *sa, struct ARegion *ar);
 void ED_region_pixelspace(struct ARegion *ar);
 void ED_region_update_rect(struct ARegion *ar);
-void ED_region_init(struct ARegion *ar);
+void ED_region_floating_initialize(struct ARegion *ar);
 void ED_region_tag_redraw(struct ARegion *ar);
 void ED_region_tag_redraw_partial(struct ARegion *ar, const struct rcti *rct, bool rebuild);
 void ED_region_tag_redraw_overlay(struct ARegion *ar);
diff --git a/source/blender/editors/interface/interface_region_hud.c b/source/blender/editors/interface/interface_region_hud.c
index fa471441cc9..d32cd5c17e2 100644
--- a/source/blender/editors/interface/interface_region_hud.c
+++ b/source/blender/editors/interface/interface_region_hud.c
@@ -364,7 +364,7 @@ void ED_area_type_hud_ensure(bContext *C, ScrArea *sa)
     ED_area_update_region_sizes(wm, win, sa);
   }
 
-  ED_region_init(ar);
+  ED_region_floating_initialize(ar);
   ED_region_tag_redraw(ar);
 
   /* Reset zoom level (not well supported). */
diff --git a/source/blender/editors/interface/interface_region_popup.c b/source/blender/editors/interface/interface_region_popup.c
index 63dee77e90e..59d955e0278 100644
--- a/source/blender/editors/interface/interface_region_popup.c
+++ b/source/blender/editors/interface/interface_region_popup.c
@@ -728,7 +728,7 @@ uiBlock *ui_popup_block_refresh(bContext *C,
   ui_popup_block_scrolltest(block);
 
   /* adds subwindow */
-  ED_region_init(ar);
+  ED_region_floating_initialize(ar);
 
   /* get winmat now that we actually have the subwindow */
   wmGetProjectionMatrix(block->winmat, &ar->winrct);
diff --git a/source/blender/editors/interface/interface_region_search.c b/source/blender/editors/interface/interface_region_search.c
index 251bc86a3f5..94bcd6ab37d 100644
--- a/source/blender/editors/interface/interface_region_search.c
+++ b/source/blender/editors/interface/interface_region_search.c
@@ -639,7 +639,7 @@ ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiBut *but
   }
 
   /* adds subwindow */
-  ED_region_init(ar);
+  ED_region_floating_initialize(ar);
 
   /* notify change and redraw */
   ED_region_tag_redraw(ar);
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index 38c17f3c395..7a0c04be356 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -1391,7 +1391,7 @@ static ARegion *ui_tooltip_create_with_data(bContext *C,
   }
 
   /* adds subwindow */
-  ED_region_init(ar);
+  ED_region_floating_initialize(ar);
 
   /* notify change and redraw */
   ED_region_tag_redraw(ar);
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index f8dd4f4612f..cb0be6f56ac 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -1841,8 +1841,10 @@ void ED_region_update_rect(ARegion *ar)
 }
 
 /* externally called for floating regions like menus */
-void ED_region_init(ARegion *ar)
+void ED_region_floating_initialize(ARegion *ar)
 {
+  BLI_assert(ar->alignment == RGN_ALIGN_FLOAT);
+
   /* refresh can be called before window opened */
   region_subwindow(ar);



More information about the Bf-blender-cvs mailing list