griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: Slightly simplify box style panel margin offset

Browse Source 
A small cleanup to use fewer if statements.
This commit is contained in:
Hans Goudey
2020-06-25 16:16:29 -04:00
parent fd0d8c710b
commit af4e68357b
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/interface/interface_panel.c
View File

@@ -1491,11 +1491,6 @@ static bool uiAlignPanelStep(ScrArea *area, ARegion *region, const float fac, co
ps->panel->ofsx = 0;
ps->panel->ofsy = -get_panel_size_y(ps->panel);
ps->panel->ofsx += ps->panel->runtime.region_ofsx;
/* Extra margin if the panel is a box style panel. */
if (ps->panel->type && ps->panel->type->flag & PNL_DRAW_BOX) {
ps->panel->ofsx += UI_PANEL_BOX_STYLE_MARGIN;
ps->panel->ofsy -= UI_PANEL_BOX_STYLE_MARGIN;
}
for (a = 0; a < tot - 1; a++, ps++) {
psnext = ps + 1;
@@ -1505,16 +1500,12 @@ static bool uiAlignPanelStep(ScrArea *area, ARegion *region, const float fac, co
bool use_box_next = psnext->panel->type && psnext->panel->type->flag & PNL_DRAW_BOX;
psnext->panel->ofsx = ps->panel->ofsx;
psnext->panel->ofsy = get_panel_real_ofsy(ps->panel) - get_panel_size_y(psnext->panel);
/* Extra margin for box style panels. */
ps->panel->ofsx += (use_box) ? UI_PANEL_BOX_STYLE_MARGIN : 0.0f;
if (use_box || use_box_next) {
psnext->panel->ofsy -= UI_PANEL_BOX_STYLE_MARGIN;
}
if (use_box && !use_box_next) {
psnext->panel->ofsx -= UI_PANEL_BOX_STYLE_MARGIN;
}
else if (!use_box && use_box_next) {
psnext->panel->ofsx += UI_PANEL_BOX_STYLE_MARGIN;
}
}
else {
psnext->panel->ofsx = get_panel_real_ofsx(ps->panel);
@@ -1522,6 +1513,10 @@ static bool uiAlignPanelStep(ScrArea *area, ARegion *region, const float fac, co
get_panel_size_y(psnext->panel);
}
}
/* Extra margin for the last panel if it's a box-style panel. */
if (panelsort[tot - 1].panel->type && panelsort[tot - 1].panel->type->flag & PNL_DRAW_BOX) {
panelsort[tot - 1].panel->ofsx += UI_PANEL_BOX_STYLE_MARGIN;
}
/* we interpolate */
done = false;