forked from bartvdbraak/blender
fix [#27578] Fileselector UI area does not scale with UI (partially hides buttons)
This commit is contained in:
parent
d1c99081ea
commit
f571d1d238
@ -831,6 +831,9 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int
|
||||
prefsizex= ar->sizex?ar->sizex:ar->type->prefsizex;
|
||||
if(ar->regiontype==RGN_TYPE_HEADER)
|
||||
prefsizey= ar->type->prefsizey;
|
||||
else if(ar->regiontype==RGN_TYPE_UI && sa->spacetype == SPACE_FILE) {
|
||||
prefsizey= UI_UNIT_Y * 2 + (UI_UNIT_Y/2);
|
||||
}
|
||||
else
|
||||
prefsizey= ar->sizey?ar->sizey:ar->type->prefsizey;
|
||||
|
||||
|
@ -111,8 +111,8 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
|
||||
{
|
||||
/* Button layout. */
|
||||
const int max_x = ar->winx - 10;
|
||||
const int line1_y = IMASEL_BUTTONS_HEIGHT/2 + IMASEL_BUTTONS_MARGIN*2;
|
||||
const int line2_y = IMASEL_BUTTONS_MARGIN;
|
||||
const int line1_y = ar->winy - (IMASEL_BUTTONS_HEIGHT/2 + IMASEL_BUTTONS_MARGIN);
|
||||
const int line2_y = line1_y - (IMASEL_BUTTONS_HEIGHT/2 + IMASEL_BUTTONS_MARGIN);
|
||||
const int input_minw = 20;
|
||||
const int btn_h = UI_UNIT_Y;
|
||||
const int btn_fn_w = UI_UNIT_X;
|
||||
|
@ -520,9 +520,14 @@ static void file_ui_area_draw(const bContext *C, ARegion *ar)
|
||||
glClearColor(col[0], col[1], col[2], 0.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
/* scrolling here is just annoying, disable it */
|
||||
ar->v2d.cur.ymax= ar->v2d.cur.ymax - ar->v2d.cur.ymin;
|
||||
ar->v2d.cur.ymin= 0;
|
||||
|
||||
/* set view2d view matrix for scrolling (without scrollers) */
|
||||
UI_view2d_view_ortho(&ar->v2d);
|
||||
|
||||
|
||||
file_draw_buttons(C, ar);
|
||||
|
||||
UI_view2d_view_restore(C);
|
||||
|
Loading…
Reference in New Issue
Block a user