From 937e4fb49ade28ec4b800b8ee216dbbe874f3ca1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 10 Jun 2018 16:42:19 +0200 Subject: UI: change toolbar icon size from 38 -> 32 --- source/blender/editors/include/UI_interface_icons.h | 2 +- source/blender/editors/space_view3d/space_view3d.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.h index ee43b987a49..651081c46bb 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.h @@ -49,7 +49,7 @@ typedef struct IconFile { #define ICON_DEFAULT_HEIGHT 16 #define ICON_DEFAULT_WIDTH 16 -#define ICON_DEFAULT_HEIGHT_TOOLBAR 38 +#define ICON_DEFAULT_HEIGHT_TOOLBAR 32 #define ICON_DEFAULT_HEIGHT_SCALE ((int)(UI_UNIT_Y * 0.8f)) #define ICON_DEFAULT_WIDTH_SCALE ((int)(UI_UNIT_X * 0.8f)) diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 7b395153417..63d7d98b689 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1331,7 +1331,7 @@ static int view3d_tools_region_snap_size(const ARegion *ar, int size, int axis) { if (axis == 0) { /* Note, this depends on the icon size: see #ICON_DEFAULT_HEIGHT_TOOLBAR. */ - const float snap_units[] = {3 + 0.25f, 5 + 0.25}; + const float snap_units[] = {2 + 0.8f, 4 + 0.8f}; const float aspect = BLI_rctf_size_x(&ar->v2d.cur) / (BLI_rcti_size_x(&ar->v2d.mask) + 1); int best_diff = INT_MAX; int best_size = size; -- cgit v1.2.3