From 175110ec8753a94bc265beb47ff3767e65a82ecc Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Sat, 28 Nov 2015 17:14:45 +0100 Subject: Cleanup: 'area' vs 'region' Apparently this is the result of some sloppiness during 2.5 project and since then it confused people who were trying to understand the area-region relation (myself included). Sorry if this causes merge conflicts for anyone, but at some point we really had to do it :/ --- source/blender/editors/space_logic/space_logic.c | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'source/blender/editors/space_logic') diff --git a/source/blender/editors/space_logic/space_logic.c b/source/blender/editors/space_logic/space_logic.c index 34a5fee88eb..243a522011b 100644 --- a/source/blender/editors/space_logic/space_logic.c +++ b/source/blender/editors/space_logic/space_logic.c @@ -113,8 +113,8 @@ static SpaceLink *logic_new(const bContext *C) ar->regiontype= RGN_TYPE_UI; ar->alignment= RGN_ALIGN_RIGHT; - /* main area */ - ar= MEM_callocN(sizeof(ARegion), "main area for logic"); + /* main region */ + ar= MEM_callocN(sizeof(ARegion), "main region for logic"); BLI_addtail(&slogic->regionbase, ar); ar->regiontype= RGN_TYPE_WINDOW; @@ -230,7 +230,7 @@ static int logic_context(const bContext *UNUSED(C), const char *UNUSED(member), /* add handlers, stuff you only do once or on area/region changes */ -static void logic_main_area_init(wmWindowManager *wm, ARegion *ar) +static void logic_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -241,7 +241,7 @@ static void logic_main_area_init(wmWindowManager *wm, ARegion *ar) WM_event_add_keymap_handler(&ar->handlers, keymap); } -static void logic_main_area_draw(const bContext *C, ARegion *ar) +static void logic_main_region_draw(const bContext *C, ARegion *ar) { /* draw entirely, view changes should be handled here */ // SpaceLogic *slogic= CTX_wm_space_logic(C); @@ -270,7 +270,7 @@ static void logic_main_area_draw(const bContext *C, ARegion *ar) /* *********************** buttons region ************************ */ /* add handlers, stuff you only do once or on area/region changes */ -static void logic_buttons_area_init(wmWindowManager *wm, ARegion *ar) +static void logic_buttons_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -280,7 +280,7 @@ static void logic_buttons_area_init(wmWindowManager *wm, ARegion *ar) WM_event_add_keymap_handler(&ar->handlers, keymap); } -static void logic_buttons_area_draw(const bContext *C, ARegion *ar) +static void logic_buttons_region_draw(const bContext *C, ARegion *ar) { ED_region_panels(C, ar, NULL, -1, true); } @@ -288,12 +288,12 @@ static void logic_buttons_area_draw(const bContext *C, ARegion *ar) /************************* header region **************************/ /* add handlers, stuff you only do once or on area/region changes */ -static void logic_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar) +static void logic_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } -static void logic_header_area_draw(const bContext *C, ARegion *ar) +static void logic_header_region_draw(const bContext *C, ARegion *ar) { ED_region_header(C, ar); } @@ -322,8 +322,8 @@ void ED_spacetype_logic(void) art = MEM_callocN(sizeof(ARegionType), "spacetype logic region"); art->regionid = RGN_TYPE_WINDOW; art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES | ED_KEYMAP_VIEW2D; - art->init = logic_main_area_init; - art->draw = logic_main_area_draw; + art->init = logic_main_region_init; + art->draw = logic_main_region_draw; art->listener = logic_listener; BLI_addhead(&st->regiontypes, art); @@ -334,8 +334,8 @@ void ED_spacetype_logic(void) art->prefsizex= 220; // XXX art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES; art->listener = logic_listener; - art->init = logic_buttons_area_init; - art->draw = logic_buttons_area_draw; + art->init = logic_buttons_region_init; + art->draw = logic_buttons_region_draw; BLI_addhead(&st->regiontypes, art); /* regions: header */ @@ -343,8 +343,8 @@ void ED_spacetype_logic(void) art->regionid = RGN_TYPE_HEADER; art->prefsizey = HEADERY; art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER; - art->init = logic_header_area_init; - art->draw = logic_header_area_draw; + art->init = logic_header_region_init; + art->draw = logic_header_region_draw; BLI_addhead(&st->regiontypes, art); -- cgit v1.2.3