[Bf-blender-cvs] [937e4fb49ad] blender2.8: UI: change toolbar icon size from 38 -> 32

[Campbell Barton]

Commit: 937e4fb49ade28ec4b800b8ee216dbbe874f3ca1
Author: Campbell Barton
Date:   Sun Jun 10 16:42:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB937e4fb49ade28ec4b800b8ee216dbbe874f3ca1

UI: change toolbar icon size from 38 -> 32

===================================================================

M	release/scripts/startup/bl_ui/space_toolsystem_common.py
M	source/blender/editors/include/UI_interface_icons.h
M	source/blender/editors/space_view3d/space_view3d.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 2b9d4207272..20db56af416 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -425,7 +425,7 @@ class ToolSelectPanelHelper:
         return ui_gen, show_text
 
     @classmethod
-    def draw_cls(cls, layout, context, detect_layout=True, scale_y=2.0):
+    def draw_cls(cls, layout, context, detect_layout=True, scale_y=1.75):
         # Use a classmethod so it can be called outside of a panel context.
 
         # XXX, this UI isn't very nice.
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;