[Bf-blender-cvs] [965425bcbc4] master: Fix T86463: Colored collection icons don't scale with zoom level

[Leon Leno]

Commit: 965425bcbc4dd8340286b83bccfa17e99792f594
Author: Leon Leno
Date:   Wed Apr 7 08:41:36 2021 -0600
Branches: master
https://developer.blender.org/rB965425bcbc4dd8340286b83bccfa17e99792f594

Fix T86463: Colored collection icons don't scale with zoom level

This patch fixes the issue in T86463 that colored collection icons in
the collection search box don't scale according to the zoom level.

The issue was caused by the drawing function for the colored
collection icons not allowing to change the size of the icons.
This patch addresses that by scaling the icon based on the drawing
width.

Reviewed By: #user_interface, natecraddock, Severin

Differential Revision: https://developer.blender.org/D10708

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

M	source/blender/editors/interface/interface_icons.c

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

diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index c16c3d2c49a..225b1b36ac3 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -457,13 +457,15 @@ DEF_ICON_VECTOR_COLORSET_DRAW_NTH(20, 19)
 #  undef DEF_ICON_VECTOR_COLORSET_DRAW_NTH
 
 static void vicon_collection_color_draw(
-    short color_tag, int x, int y, int UNUSED(w), int UNUSED(h), float UNUSED(alpha))
+    short color_tag, int x, int y, int w, int UNUSED(h), float UNUSED(alpha))
 {
   bTheme *btheme = UI_GetTheme();
   const ThemeCollectionColor *collection_color = &btheme->collection_color[color_tag];
 
+  const float aspect = (float)ICON_DEFAULT_WIDTH / (float)w;
+
   UI_icon_draw_ex(
-      x, y, ICON_OUTLINER_COLLECTION, U.inv_dpi_fac, 1.0f, 0.0f, collection_color->color, true);
+      x, y, ICON_OUTLINER_COLLECTION, aspect, 1.0f, 0.0f, collection_color->color, true);
 }
 
 #  define DEF_ICON_COLLECTION_COLOR_DRAW(index, color) \