[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56126] trunk/blender/source/blender/ editors/interface: Bug fix #34868

Ton Roosendaal ton at blender.org
Thu Apr 18 10:51:10 CEST 2013


Revision: 56126
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56126
Author:   ton
Date:     2013-04-18 08:51:07 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Bug fix #34868

Pulldown menus with long shortcut text labels got clipped badly occasionally.
Made the offset follow DPI better.

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

Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c	2013-04-18 04:24:18 UTC (rev 56125)
+++ trunk/blender/source/blender/editors/interface/interface_style.c	2013-04-18 08:51:07 UTC (rev 56126)
@@ -162,7 +162,7 @@
 		}
 	}
 	else if (fs->align == UI_STYLE_TEXT_RIGHT) {
-		xofs = BLI_rcti_size_x(rect) - BLF_width(fs->uifont_id, str) - 1;
+		xofs = BLI_rcti_size_x(rect) - BLF_width(fs->uifont_id, str) - 0.1f * U.widget_unit;
 	}
 	
 	/* clip is very strict, so we give it some space */

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-04-18 04:24:18 UTC (rev 56125)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2013-04-18 08:51:07 UTC (rev 56126)
@@ -1265,7 +1265,7 @@
 	/* part text right aligned */
 	if (cpoin) {
 		fstyle->align = UI_STYLE_TEXT_RIGHT;
-		rect->xmax -= ui_but_draw_menu_icon(but) ? UI_DPI_ICON_SIZE : 5;
+		rect->xmax -= ui_but_draw_menu_icon(but) ? UI_DPI_ICON_SIZE : 0.25f * U.widget_unit;
 		uiStyleFontDraw(fstyle, rect, cpoin + 1);
 		*cpoin = '|';
 	}




More information about the Bf-blender-cvs mailing list