Commit: 5e7f995b085c1b752710c9de96963e9db4f179c2
Author: Campbell Barton
Date: Thu Feb 27 15:50:30 2014 +1100
https://developer.blender.org/rB5e7f995b085c1b752710c9de96963e9db4f179c2
Fix: 'F-Curve Editor' popup text was truncated.
===================================================================
M source/blender/editors/interface/interface_layout.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c
b/source/blender/editors/interface/interface_layout.c
index 57e7ebf..b5255eb 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -222,18 +222,25 @@ static int ui_layout_vary_direction(uiLayout *layout)
}
/* estimated size of text + icon */
-static int ui_text_icon_width(uiLayout *layout, const char *name, int icon,
int compact)
+static int ui_text_icon_width(uiLayout *layout, const char *name, int icon,
bool compact)
{
- float f5 = 0.25f * UI_UNIT_X;
- float f10 = 0.5f * UI_UNIT_X;
- int variable = ui_layout_vary_direction(layout) == UI_ITEM_VARY_X;
+ bool variable;
if (icon && !name[0])
return UI_UNIT_X; /* icon only */
- else if (icon)
- return (variable) ? UI_GetStringWidth(name) + (compact ? f5 :
f10) + UI_UNIT_X : 10 * UI_UNIT_X; /* icon + text */
- else
- return (variable) ? UI_GetStringWidth(name) + (compact ? f5 :
f10) + UI_UNIT_X : 10 * UI_UNIT_X; /* text only */
+
+ variable = (ui_layout_vary_direction(layout) == UI_ITEM_VARY_X);
+
+ if (variable) {
+ /* it may seem odd that the icon only adds (UI_UNIT_X / 4)
+ * but taking margins into account its fine */
+ return (UI_GetStringWidth(name) +
+ (UI_UNIT_X * ((compact ? 1.25f : 1.50f) +
+ (icon ? 0.25f : 0.0f))));
+ }
+ else {
+ return UI_UNIT_X * 10;
+ }
}
static void ui_item_size(uiItem *item, int *r_w, int *r_h)
@@ -1104,7 +1111,7 @@ static void ui_item_rna_size(uiLayout *layout, const char
*name, int icon, Point
RNA_property_enum_items_gettexted(layout->root->block->evil_C, ptr, prop,
&item_array, NULL, &free);
for (item = item_array; item->identifier; item++) {
if (item->identifier[0]) {
- w = max_ii(w,
ui_text_icon_width(layout, item->name, icon, 0));
+ w = max_ii(w,
ui_text_icon_width(layout, item->name, item->icon, 0));
}
}
if (free) {
diff --git a/source/blender/makesrna/intern/rna_space.c
b/source/blender/makesrna/intern/rna_space.c
index 0feebbd..0cc37a6 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -2726,7 +2726,7 @@ static void rna_def_space_graph(BlenderRNA *brna)
PropertyRNA *prop;
static EnumPropertyItem mode_items[] = {
- {SIPO_MODE_ANIMATION, "FCURVES", ICON_IPO, "F-Curve Editor",
+ {SIPO_MODE_ANIMATION, "FCURVES", ICON_IPO, "F-Curve",
"Edit animation/keyframes displayed as 2D curves"},
{SIPO_MODE_DRIVERS, "DRIVERS", ICON_DRIVER, "Drivers", "Edit
drivers"},
{0, NULL, 0, NULL, NULL}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
