sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#27578] Fileselector UI area does not scale with UI (partially hides buttons)

Browse Source
This commit is contained in:
Campbell Barton 2011-10-03 04:48:14 +00:00
parent d1c99081ea
commit f571d1d238
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/screen/area.c
View File

@ -831,6 +831,9 @@ static void region_rect_recursive(ScrArea *sa, ARegion *ar, rcti *remainder, int
prefsizex= ar->sizex?ar->sizex:ar->type->prefsizex; prefsizex= ar->sizex?ar->sizex:ar->type->prefsizex;
if(ar->regiontype==RGN_TYPE_HEADER) if(ar->regiontype==RGN_TYPE_HEADER)
prefsizey= ar->type->prefsizey; 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 else
prefsizey= ar->sizey?ar->sizey:ar->type->prefsizey; prefsizey= ar->sizey?ar->sizey:ar->type->prefsizey;

4
source/blender/editors/space_file/file_draw.c
View File

@ -111,8 +111,8 @@ void file_draw_buttons(const bContext *C, ARegion *ar)
{ {
/* Button layout. */ /* Button layout. */
const int max_x = ar->winx - 10; const int max_x = ar->winx - 10;
const int line1_y = IMASEL_BUTTONS_HEIGHT/2 + IMASEL_BUTTONS_MARGIN*2; const int line1_y = ar->winy - (IMASEL_BUTTONS_HEIGHT/2 + IMASEL_BUTTONS_MARGIN);
const int line2_y = IMASEL_BUTTONS_MARGIN; const int line2_y = line1_y - (IMASEL_BUTTONS_HEIGHT/2 + IMASEL_BUTTONS_MARGIN);
const int input_minw = 20; const int input_minw = 20;
const int btn_h = UI_UNIT_Y; const int btn_h = UI_UNIT_Y;
const int btn_fn_w = UI_UNIT_X; const int btn_fn_w = UI_UNIT_X;

5
source/blender/editors/space_file/space_file.c
View File

@ -520,9 +520,14 @@ static void file_ui_area_draw(const bContext *C, ARegion *ar)
glClearColor(col[0], col[1], col[2], 0.0); glClearColor(col[0], col[1], col[2], 0.0);
glClear(GL_COLOR_BUFFER_BIT); 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) */ /* set view2d view matrix for scrolling (without scrollers) */
UI_view2d_view_ortho(&ar->v2d); UI_view2d_view_ortho(&ar->v2d);
file_draw_buttons(C, ar); file_draw_buttons(C, ar);
UI_view2d_view_restore(C); UI_view2d_view_restore(C);