[Bf-blender-cvs] [e51272f] master: Fix report banner text width
Campbell Barton
noreply at git.blender.org
Tue Sep 22 09:27:49 CEST 2015
Commit: e51272f663353e15bf02baa83e1c7a32d9c25767
Author: Campbell Barton
Date: Tue Sep 22 17:18:43 2015 +1000
Branches: master
https://developer.blender.org/rBe51272f663353e15bf02baa83e1c7a32d9c25767
Fix report banner text width
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/editors/interface/interface_templates.c
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index de6c83e..c651e63 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit de6c83e12e75ffaac90eddbd3cb7451b57c2e0ce
+Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
diff --git a/release/scripts/addons b/release/scripts/addons
index 94c9c4e..0eef469 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 94c9c4ee3370d1feb42fc978a1f0d2db07cb9431
+Subproject commit 0eef469a5d444f396152376a49d7faad0ba51aba
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index e31cec5..cf842d8 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit e31cec5bf243f00441c7dad7a775ec4722f829d3
+Subproject commit cf842d8bb7b0033ca4fa99f7ebedcbd3810fd274
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 44e130e..1238b88 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -3484,7 +3484,8 @@ void uiTemplateReportsBanner(uiLayout *layout, bContext *C)
ui_abs = uiLayoutAbsolute(layout, false);
block = uiLayoutGetBlock(ui_abs);
- width = BLF_width(style->widget.uifont_id, report->message, report->len);
+ UI_fontstyle_set(&style->widgetlabel);
+ width = BLF_width(style->widgetlabel.uifont_id, report->message, report->len);
width = min_ii((int)(rti->widthfac * width), width);
width = max_ii(width, 10);
More information about the Bf-blender-cvs
mailing list