Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: small tweak to tooltips for enum menus, it wasn't very clear which

Browse Source 
description was for the property and which for the item.
This commit is contained in:
Brecht Van Lommel
2011-11-18 21:06:36 +00:00
parent 97808449e6
commit c26c5f3852
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/CMakeLists.txt
View File

@@ -61,8 +61,8 @@ include_directories(
# Subdirectories # Subdirectories
if(WITH_CYCLES_BLENDER) if(WITH_CYCLES_BLENDER)
add_subdirectory(blender)
add_definitions(-DBLENDER_PLUGIN) add_definitions(-DBLENDER_PLUGIN)
add_subdirectory(blender)
endif(WITH_CYCLES_BLENDER) endif(WITH_CYCLES_BLENDER)
add_subdirectory(app) add_subdirectory(app)

5
source/blender/editors/interface/interface.c
View File

@@ -2618,11 +2618,8 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s
else else
BLI_dynstr_appendf(dynstr, "|%s %%x%d", item[i].name, item[i].value); BLI_dynstr_appendf(dynstr, "|%s %%x%d", item[i].name, item[i].value);
if(value == item[i].value) { if(value == item[i].value)
icon= item[i].icon; icon= item[i].icon;
if(!tip)
tip= item[i].description;
}
} }
str= BLI_dynstr_get_cstring(dynstr); str= BLI_dynstr_get_cstring(dynstr);
BLI_dynstr_free(dynstr); BLI_dynstr_free(dynstr);

4
source/blender/editors/interface/interface_regions.c
View File

@@ -376,7 +376,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
data->totline++; data->totline++;
} }
if(but->type == ROW) { if(ELEM(but->type, ROW, MENU)) {
EnumPropertyItem *item; EnumPropertyItem *item;
int i, totitem, free; int i, totitem, free;
@@ -386,7 +386,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
if(item[i].identifier[0] && item[i].value == (int)but->hardmax) { if(item[i].identifier[0] && item[i].value == (int)but->hardmax) {
if(item[i].description[0]) { if(item[i].description[0]) {
BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), "%s: %s", item[i].name, item[i].description); BLI_snprintf(data->lines[data->totline], sizeof(data->lines[0]), "%s: %s", item[i].name, item[i].description);
data->color[data->totline]= 0xFFFFFF; data->color[data->totline]= 0xDDDDDD;
data->totline++; data->totline++;
} }
break; break;