[Bf-blender-cvs] [f667593b6a1] master: Fix text and icon positioning issue on high DPI, after recent changes in 32c5f3d.

Brecht Van Lommel noreply at git.blender.org
Sat Mar 11 04:52:59 CET 2017


Commit: f667593b6a1325c62a89a6ae1ae4718833dca4d0
Author: Brecht Van Lommel
Date:   Sat Mar 11 04:46:27 2017 +0100
Branches: master
https://developer.blender.org/rBf667593b6a1325c62a89a6ae1ae4718833dca4d0

Fix text and icon positioning issue on high DPI, after recent changes in 32c5f3d.

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

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

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

diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 6e871b8ec92..76c4eeef0c2 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -1554,7 +1554,7 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB
 	/* Icons on the left with optional text label on the right */
 	else if (but->flag & UI_HAS_ICON || show_menu_icon) {
 		const BIFIconID icon = (but->flag & UI_HAS_ICON) ? but->icon + but->iconadd : ICON_NONE;
-		const float icon_size = ICON_DEFAULT_WIDTH;
+		const float icon_size = ICON_DEFAULT_WIDTH_SCALE;
 
 		/* menu item - add some more padding so menus don't feel cramped. it must
 		 * be part of the button so that this area is still clickable */




More information about the Bf-blender-cvs mailing list