blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix missing margin below panels 

A minor cosmetic fix. When the view was scrolled all the way to the
bottom, the lowest panel would end right on the view edge. The
scrollable view should get the same margin at the bottom as used at the
top.
This commit is contained in:
Julian Eisel 2021-11-25 17:15:48 +01:00
parent 5514ca58a4
commit 5a11c6e558
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1827,6 +1827,7 @@ static void ui_panels_size(ARegion *region, int *r_x, int *r_y)
{
int sizex = 0;
int sizey = 0;
bool has_panel_with_background = false;
/* Compute size taken up by panels, for setting in view2d. */
LISTBASE_FOREACH (Panel *, panel, &region->panels) {
@ -1836,6 +1837,9 @@ static void ui_panels_size(ARegion *region, int *r_x, int *r_y)
sizex = max_ii(sizex, pa_sizex);
sizey = min_ii(sizey, pa_sizey);
if (UI_panel_should_show_background(region, panel->type)) {
has_panel_with_background = true;
}
}
}
@ -1845,6 +1849,11 @@ static void ui_panels_size(ARegion *region, int *r_x, int *r_y)
if (sizey == 0) {
sizey = -UI_PANEL_WIDTH;
}
/* Extra margin after the list so the view scrolls a few pixels further than the panel border.
* Also makes the bottom match the top margin. */
if (has_panel_with_background) {
sizey -= UI_PANEL_MARGIN_Y;
}
*r_x = sizex;
*r_y = sizey;