[Bf-blender-cvs] [20276e4b00a] master: Cleanup: Reduce variable scope in area.c
Hans Goudey
noreply at git.blender.org
Sat Oct 17 03:50:13 CEST 2020
Commit: 20276e4b00a228ab2ef80e58cc0171cec811015a
Author: Hans Goudey
Date: Fri Oct 16 20:49:47 2020 -0500
Branches: master
https://developer.blender.org/rB20276e4b00a228ab2ef80e58cc0171cec811015a
Cleanup: Reduce variable scope in area.c
===================================================================
M source/blender/editors/screen/area.c
===================================================================
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c
index b77d3d1100d..10d269151ce 100644
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@ -85,13 +85,11 @@ enum RegionEmbossSide {
static void region_draw_emboss(const ARegion *region, const rcti *scirct, int sides)
{
- rcti rect;
-
/* translate scissor rect to region space */
- rect.xmin = scirct->xmin - region->winrct.xmin;
- rect.ymin = scirct->ymin - region->winrct.ymin;
- rect.xmax = scirct->xmax - region->winrct.xmin;
- rect.ymax = scirct->ymax - region->winrct.ymin;
+ const rcti rect = {.xmin = scirct->xmin - region->winrct.xmin,
+ .xmax = scirct->xmax - region->winrct.xmin,
+ .ymin = scirct->ymin - region->winrct.ymin,
+ .ymax = scirct->ymax - region->winrct.ymin};
/* set transp line */
GPU_blend(GPU_BLEND_ALPHA);
@@ -851,8 +849,6 @@ void ED_workspace_status_text(bContext *C, const char *str)
static void area_azone_init(wmWindow *win, const bScreen *screen, ScrArea *area)
{
- AZone *az;
-
/* reinitialize entirely, regions and fullscreen add azones too */
BLI_freelistN(&area->actionzones);
@@ -908,7 +904,7 @@ static void area_azone_init(wmWindow *win, const bScreen *screen, ScrArea *area)
#endif
/* set area action zones */
- az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
+ AZone *az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
BLI_addtail(&(area->actionzones), az);
az->type = AZONE_AREA;
az->x1 = coords[i][0];
@@ -921,13 +917,11 @@ static void area_azone_init(wmWindow *win, const bScreen *screen, ScrArea *area)
static void fullscreen_azone_init(ScrArea *area, ARegion *region)
{
- AZone *az;
-
if (ED_area_is_global(area) || (region->regiontype != RGN_TYPE_WINDOW)) {
return;
}
- az = (AZone *)MEM_callocN(sizeof(AZone), "fullscreen action zone");
+ AZone *az = (AZone *)MEM_callocN(sizeof(AZone), "fullscreen action zone");
BLI_addtail(&(area->actionzones), az);
az->type = AZONE_FULLSCREEN;
az->region = region;
@@ -984,13 +978,11 @@ static void region_azone_edge(AZone *az, ARegion *region)
/* region already made zero sized, in shape of edge */
static void region_azone_tab_plus(ScrArea *area, AZone *az, ARegion *region)
{
- int tot = 0, add;
- /* Edge offset multiplied by the */
-
float edge_offset = 1.0f;
const float tab_size_x = 0.7f * U.widget_unit;
const float tab_size_y = 0.4f * U.widget_unit;
+ int tot = 0;
LISTBASE_FOREACH (AZone *, azt, &area->actionzones) {
if (azt->edge == az->edge) {
tot++;
@@ -998,13 +990,14 @@ static void region_azone_tab_plus(ScrArea *area, AZone *az, ARegion *region)
}
switch (az->edge) {
- case AE_TOP_TO_BOTTOMRIGHT:
- add = (region->winrct.ymax == area->totrct.ymin) ? 1 : 0;
+ case AE_TOP_TO_BOTTOMRIGHT: {
+ int add = (region->winrct.ymax == area->totrct.ymin) ? 1 : 0;
az->x1 = region->winrct.xmax - ((edge_offset + 1.0f) * tab_size_x);
az->y1 = region->winrct.ymax - add;
az->x2 = region->winrct.xmax - (edge_offset * tab_size_x);
az->y2 = region->winrct.ymax - add + tab_size_y;
break;
+ }
case AE_BOTTOM_TO_TOPLEFT:
az->x1 = region->winrct.xmax - ((edge_offset + 1.0f) * tab_size_x);
az->y1 = region->winrct.ymin - tab_size_y;
@@ -1047,14 +1040,13 @@ static void region_azone_edge_init(ScrArea *area,
AZEdge edge,
const bool is_fullscreen)
{
- AZone *az = NULL;
const bool is_hidden = (region->flag & (RGN_FLAG_HIDDEN | RGN_FLAG_TOO_SMALL));
if (!region_azone_edge_poll(region, is_fullscreen)) {
return;
}
- az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
+ AZone *az = (AZone *)MEM_callocN(sizeof(AZone), "actionzone");
BLI_addtail(&(area->actionzones), az);
az->type = AZONE_REGION;
az->region = region;
@@ -1173,11 +1165,10 @@ static int rct_fits(const rcti *rect, char dir, int size)
/* function checks if some overlapping region was defined before - on same place */
static void region_overlap_fix(ScrArea *area, ARegion *region)
{
+ /* find overlapping previous region on same place */
ARegion *ar1;
- const int align = RGN_ALIGN_ENUM_FROM_MASK(region->alignment);
int align1 = 0;
-
- /* find overlapping previous region on same place */
+ const int align = RGN_ALIGN_ENUM_FROM_MASK(region->alignment);
for (ar1 = region->prev; ar1; ar1 = ar1->prev) {
if (ar1->flag & RGN_FLAG_HIDDEN) {
continue;
@@ -1846,20 +1837,18 @@ static void ed_default_handlers(
void ED_area_update_region_sizes(wmWindowManager *wm, wmWindow *win, ScrArea *area)
{
- rcti rect, overlap_rect;
- rcti window_rect;
-
if (!(area->flag & AREA_FLAG_REGION_SIZE_UPDATE)) {
return;
}
const bScreen *screen = WM_window_get_active_screen(win);
+ rcti window_rect;
WM_window_rect_calc(win, &window_rect);
area_calc_totrct(area, &window_rect);
/* region rect sizes */
- rect = area->totrct;
- overlap_rect = rect;
+ rcti rect = area->totrct;
+ rcti overlap_rect = rect;
region_rect_recursive(area, area->regionbase.first, &rect, &overlap_rect, 0);
/* Dynamically sized regions may have changed region sizes, so we have to force azone update. */
@@ -1887,12 +1876,12 @@ void ED_area_init(wmWindowManager *wm, wmWindow *win, ScrArea *area)
WorkSpace *workspace = WM_window_get_active_workspace(win);
const bScreen *screen = BKE_workspace_active_screen_get(win->workspace_hook);
ViewLayer *view_layer = WM_window_get_active_view_layer(win);
- rcti rect, overlap_rect;
- rcti window_rect;
if (ED_area_is_global(area) && (area->global->flag & GLOBAL_AREA_IS_HIDDEN)) {
return;
}
+
+ rcti window_rect;
WM_window_rect_calc(win, &window_rect);
/* set typedefinitions */
@@ -1911,8 +1900,8 @@ void ED_area_init(wmWindowManager *wm, wmWindow *win, ScrArea *area)
area_calc_totrct(area, &window_rect);
/* region rect sizes */
- rect = area->totrct;
- overlap_rect = rect;
+ rcti rect = area->totrct;
+ rcti overlap_rect = rect;
region_rect_recursive(area, area->regionbase.first, &rect, &overlap_rect, 0);
area->flag &= ~AREA_FLAG_REGION_SIZE_UPDATE;
@@ -2045,7 +2034,6 @@ void ED_region_toggle_hidden(bContext *C, ARegion *region)
*/
void ED_area_data_copy(ScrArea *area_dst, ScrArea *area_src, const bool do_free)
{
- SpaceType *st;
const char spacetype = area_dst->spacetype;
const short flag_copy = HEADER_NO_PULLDOWN;
@@ -2064,13 +2052,13 @@ void ED_area_data_copy(ScrArea *area_dst, ScrArea *area_src, const bool do_free)
/* regions */
if (do_free) {
- st = BKE_spacetype_from_id(spacetype);
+ SpaceType *st = BKE_spacetype_from_id(spacetype);
LISTBASE_FOREACH (ARegion *, region, &area_dst->regionbase) {
BKE_area_region_free(st, region);
}
BLI_freelistN(&area_dst->regionbase);
}
- st = BKE_spacetype_from_id(area_src->spacetype);
+ SpaceType *st = BKE_spacetype_from_id(area_src->spacetype);
LISTBASE_FOREACH (ARegion *, region, &area_src->regionbase) {
ARegion *newar = BKE_area_region_copy(st, region);
BLI_addtail(&area_dst->regionbase, newar);
@@ -2357,7 +2345,6 @@ void ED_area_newspace(bContext *C, ScrArea *area, int type, const bool skip_regi
wmWindow *win = CTX_wm_window(C);
if (area->spacetype != type) {
- SpaceType *st;
SpaceLink *slold = area->spacedata.first;
/* store area->type->exit callback */
void *area_exit = area->type ? area->type->exit : NULL;
@@ -2392,7 +2379,7 @@ void ED_area_newspace(bContext *C, ScrArea *area, int type, const bool skip_regi
area->type->exit = area_exit;
}
- st = BKE_spacetype_from_id(type);
+ SpaceType *st = BKE_spacetype_from_id(type);
area->spacetype = type;
area->type = st;
@@ -2853,7 +2840,6 @@ void ED_region_panels_layout_ex(const bContext *C,
ScrArea *area = CTX_wm_area(C);
View2D *v2d = ®ion->v2d;
- int x, y, w, em;
bool use_category_tabs = (category_override == NULL) && region_uses_category_tabs(area, region);
/* offset panels for small vertical tab area */
@@ -2877,11 +2863,11 @@ void ED_region_panels_layout_ex(const bContext *C,
margin_x = category_tabs_width;
}
- w = BLI_rctf_size_x(&v2d->cur);
- em = (region->type->prefsizex) ? 10 : 20; /* works out to 10*UI_UNIT_X or 20*UI_UNIT_X */
+ const int w = BLI_rctf_size_x(&v2d->cur) - margin_x;
+ /* Works out to 10 * UI_UNIT_X or 20 * UI_UNIT_X. */
+ const int em = (region->type->prefsizex) ? 10 : 20;
- w -= margin_x;
- int w_box_panel = w - UI_PANEL_BOX_STYLE_MARGIN * 2.0f;
+ const int w_box_panel = w - UI_PANEL_BOX_STYLE_MARGIN * 2.0f;
/* create panels */
UI_panels_begin(C, region);
@@ -2960,6 +2946,7 @@ void ED_region_panels_layout_ex(const bContext *C,
}
/* align panels and return size */
+ int x, y;
UI_panels_end(C, region, &x, &y);
/* before setting the view */
@@ -3044,9 +3031,9 @@ void ED_region_panels_draw(const bContext *C, ARegion *region)
/* scrollers */
const rcti *mask = NULL;
- rcti mask_buf;
if (region->runtime.category &&
(RGN_ALIGN_ENUM_FROM_MASK(region->alignment) == RGN_ALIGN_RIGHT)) {
+ rcti mask_buf;
UI_view2d_mask_from_win(v2d, &mask_buf);
mask_buf.xmax -= UI_PANEL_CATEGORY_MARGIN_WIDTH;
mask = &mask_buf;
@@ -3070,11 +3057,9 @@ void ED_region_panels(const bContext *C, ARegion *region)
void ED_region_panels_init(wmWindowManager *wm, ARegion *region)
{
- wmKeyMap *keymap;
-
UI_view2d_region_reinit(®ion->v2d, V2D_COMMONVIEW_PANELS_UI, region->winx, region->winy);
- keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0);
+ wmKeyMap *keymap = WM_keymap_ensure(wm->defaultconf, "View2D Buttons List", 0, 0);
WM_event_add_keymap_handler(®ion->handlers, keymap);
}
@@ -3224,9 +3209,6 @@ bool ED_region_property_search(const bContext *C,
void ED_region_header_layout(const bContext *C, ARegion *region)
{
const uiStyle *style = UI_style_get_dpi();
- uiBlock *block;
- uiLayout *layout;
- Header header = {NULL};
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list