[Bf-blender-cvs] [a30f32891ff] blender2.8: Cleanup: remove dummy tooltips
Campbell Barton
noreply at git.blender.org
Wed Sep 19 01:54:46 CEST 2018
Commit: a30f32891ffd562293cec812477065d6ca49920e
Author: Campbell Barton
Date: Wed Sep 19 08:34:41 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBa30f32891ffd562293cec812477065d6ca49920e
Cleanup: remove dummy tooltips
===================================================================
M source/blender/editors/interface/interface_layout.c
===================================================================
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index c19dc770fb9..9c7c55fb3c8 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2313,12 +2313,15 @@ static uiBut *uiItemL_(uiLayout *layout, const char *name, int icon)
w = ui_text_icon_width(layout, name, icon, 0);
- if (icon && name[0])
- but = uiDefIconTextBut(block, UI_BTYPE_LABEL, 0, icon, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "AAAAAAAa");
- else if (icon)
- but = uiDefIconBut(block, UI_BTYPE_LABEL, 0, icon, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "BBBBBBBBBBBB");
- else
- but = uiDefBut(block, UI_BTYPE_LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "CCCCCCCCCCCCC");
+ if (icon && name[0]) {
+ but = uiDefIconTextBut(block, UI_BTYPE_LABEL, 0, icon, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, NULL);
+ }
+ else if (icon) {
+ but = uiDefIconBut(block, UI_BTYPE_LABEL, 0, icon, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, NULL);
+ }
+ else {
+ but = uiDefBut(block, UI_BTYPE_LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, NULL);
+ }
/* to compensate for string size padding in ui_text_icon_width,
* make text aligned right if the layout is aligned right.
More information about the Bf-blender-cvs
mailing list