diff options
| author | Harley Acheson <harley.acheson@gmail.com> | 2022-09-05 20:37:15 +0300 |
|---|---|---|
| committer | Harley Acheson <harley.acheson@gmail.com> | 2022-09-05 20:37:15 +0300 |
| commit | d26a0be968e09a89bc0cd49dd08aba3e08a28aad (patch) | |
| tree | 9e3ac5b7dde79576d86f886d31a002c731bda894 | |
| parent | 258d3858572b588051814363abe42044eeec3182 (diff) | |
UI: Corrected Scaling of AREAMINX
Minimum horizontal area size should be scaled by UI resolution.
See D15865 for more details.
Differential Revision: https://developer.blender.org/D15865
Reviewed by Brecht Van Lommel
| -rw-r--r-- | source/blender/editors/screen/screen_geometry.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 3 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_screen_types.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/screen/screen_geometry.c b/source/blender/editors/screen/screen_geometry.c index 3486ea8b466..3ad3fa7892c 100644 --- a/source/blender/editors/screen/screen_geometry.c +++ b/source/blender/editors/screen/screen_geometry.c @@ -284,7 +284,7 @@ short screen_geom_find_area_split_point(const ScrArea *area, { const int cur_area_width = screen_geom_area_width(area); const int cur_area_height = screen_geom_area_height(area); - const short area_min_x = AREAMINX; + const short area_min_x = AREAMINX * U.dpi_fac; const short area_min_y = ED_area_headersize(); /* area big enough? */ diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index c069b3c6292..5331747beae 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1639,7 +1639,7 @@ static void area_move_set_limits(wmWindow *win, } } else { - int areamin = AREAMINX; + int areamin = AREAMINX * U.dpi_fac; if (area->v1->vec.x > window_rect.xmin) { areamin += U.pixelsize; @@ -2062,7 +2062,7 @@ static bool area_split_allowed(const ScrArea *area, const eScreenAxis dir_axis) return false; } - if ((dir_axis == SCREEN_AXIS_V && area->winx <= 2 * AREAMINX) || + if ((dir_axis == SCREEN_AXIS_V && area->winx <= 2 * AREAMINX * U.dpi_fac) || (dir_axis == SCREEN_AXIS_H && area->winy <= 2 * ED_area_headersize())) { /* Must be at least double minimum sizes to split into two. */ return false; diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 8026cc509b2..2bee60557b7 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -978,8 +978,7 @@ void ED_spacetype_buttons(void) /* regions: navigation bar */ art = MEM_callocN(sizeof(ARegionType), "spacetype nav buttons region"); art->regionid = RGN_TYPE_NAV_BAR; - art->prefsizex = AREAMINX - 3; /* XXX Works and looks best, - * should we update AREAMINX accordingly? */ + art->prefsizex = AREAMINX; art->keymapflag = ED_KEYMAP_UI | ED_KEYMAP_FRAMES | ED_KEYMAP_NAVBAR; art->init = buttons_navigation_bar_region_init; art->draw = buttons_navigation_bar_region_draw; diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 856d48e395b..9b999e4426f 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -539,7 +539,7 @@ enum { }; #define AREAGRID 4 -#define AREAMINX 32 +#define AREAMINX 29 #define HEADER_PADDING_Y 6 #define HEADERY (20 + HEADER_PADDING_Y) |