[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53295] trunk/blender/source/blender/ editors/interface/interface_widgets.c: Bug fix (own collection)

Ton Roosendaal ton at blender.org
Sun Dec 23 14:02:42 CET 2012


Revision: 53295
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53295
Author:   ton
Date:     2012-12-23 13:02:38 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Bug fix (own collection) 

Icons in search menus were not drawing on the right location when UI panels were zoomed in large.
Not very common, but annoying. (DPI setting worked fine)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_widgets.c

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-23 12:53:58 UTC (rev 53294)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-12-23 13:02:38 UTC (rev 53295)
@@ -3467,14 +3467,14 @@
 	if (iconid) {
 		float height, aspect;
 		int xs = rect->xmin + 0.2f * UI_UNIT_X;
-		int ys = 1 + (rect->ymin + rect->ymax - UI_DPI_ICON_SIZE) / 2;
+		int ys = rect->ymin + 0.1f * BLI_rcti_size_y(rect);
 		
 		/* icons are 80% of height of button (16 pixels inside 20 height) */
 		height = 0.8f * BLI_rcti_size_y(rect);
 		aspect = ICON_DEFAULT_HEIGHT / height;
-
+		
 		glEnable(GL_BLEND);
-		UI_icon_draw_aspect(xs, ys, iconid, aspect, 0.5f); /* XXX scale weak get from fstyle? */
+		UI_icon_draw_aspect(xs, ys, iconid, aspect, 1.0f); /* XXX scale weak get from fstyle? */
 		glDisable(GL_BLEND);
 	}
 }




More information about the Bf-blender-cvs mailing list