diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-11-28 19:14:45 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-11-28 19:22:44 +0300 |
commit | 175110ec8753a94bc265beb47ff3767e65a82ecc (patch) | |
tree | 5995385d14a7ce7d43797c510c4f270ed55c393a /source/blender/editors/space_time | |
parent | 51f996836c1bd6484905b224c46f497c7faf66a2 (diff) |
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 :/
Diffstat (limited to 'source/blender/editors/space_time')
-rw-r--r-- | source/blender/editors/space_time/space_time.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 9ecea7462ff..c5dfc123f39 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -485,7 +485,7 @@ static void time_listener(bScreen *UNUSED(sc), ScrArea *sa, wmNotifier *wmn) /* ---------------- */ /* add handlers, stuff you only do once or on area/region changes */ -static void time_main_area_init(wmWindowManager *wm, ARegion *ar) +static void time_main_region_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; @@ -496,7 +496,7 @@ static void time_main_area_init(wmWindowManager *wm, ARegion *ar) WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); } -static void time_main_area_draw(const bContext *C, ARegion *ar) +static void time_main_region_draw(const bContext *C, ARegion *ar) { /* draw entirely, view changes should be handled here */ Scene *scene = CTX_data_scene(C); @@ -555,7 +555,7 @@ static void time_main_area_draw(const bContext *C, ARegion *ar) UI_view2d_scrollers_free(scrollers); } -static void time_main_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn) +static void time_main_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn) { /* context changes */ switch (wmn->category) { @@ -586,17 +586,17 @@ static void time_main_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), AR /* ************************ header time area region *********************** */ /* add handlers, stuff you only do once or on area/region changes */ -static void time_header_area_init(wmWindowManager *UNUSED(wm), ARegion *ar) +static void time_header_region_init(wmWindowManager *UNUSED(wm), ARegion *ar) { ED_region_header_init(ar); } -static void time_header_area_draw(const bContext *C, ARegion *ar) +static void time_header_region_draw(const bContext *C, ARegion *ar) { ED_region_header(C, ar); } -static void time_header_area_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn) +static void time_header_region_listener(bScreen *UNUSED(sc), ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn) { /* context changes */ switch (wmn->category) { @@ -649,8 +649,8 @@ static SpaceLink *time_new(const bContext *C) ar->regiontype = RGN_TYPE_HEADER; ar->alignment = RGN_ALIGN_BOTTOM; - /* main area */ - ar = MEM_callocN(sizeof(ARegion), "main area for time"); + /* main region */ + ar = MEM_callocN(sizeof(ARegion), "main region for time"); BLI_addtail(&stime->regionbase, ar); ar->regiontype = RGN_TYPE_WINDOW; @@ -737,9 +737,9 @@ void ED_spacetype_time(void) art->regionid = RGN_TYPE_WINDOW; art->keymapflag = ED_KEYMAP_VIEW2D | ED_KEYMAP_MARKERS | ED_KEYMAP_ANIMATION | ED_KEYMAP_FRAMES; - art->init = time_main_area_init; - art->draw = time_main_area_draw; - art->listener = time_main_area_listener; + art->init = time_main_region_init; + art->draw = time_main_region_draw; + art->listener = time_main_region_listener; art->keymap = time_keymap; BLI_addhead(&st->regiontypes, art); @@ -749,9 +749,9 @@ void ED_spacetype_time(void) art->prefsizey = HEADERY; art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_VIEW2D | ED_KEYMAP_FRAMES | ED_KEYMAP_HEADER; - art->init = time_header_area_init; - art->draw = time_header_area_draw; - art->listener = time_header_area_listener; + art->init = time_header_region_init; + art->draw = time_header_region_draw; + art->listener = time_header_region_listener; BLI_addhead(&st->regiontypes, art); BKE_spacetype_register(st); |