UI: small tweak to tooltips for enum menus, it wasn't very clear which
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 18 Nov 2011 21:06:36 +0000 (21:06 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Fri, 18 Nov 2011 21:06:36 +0000 (21:06 +0000)
description was for the property and which for the item.

intern/cycles/CMakeLists.txt
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_regions.c

index 2a7a6f4ca653b2cfd9e0595e362038b8a0e64c12..a85b2ba8c2a14e4d3cc4ccc3ef0510dd02df7647 100644 (file)
@@ -61,8 +61,8 @@ include_directories(
 # Subdirectories
 
 if(WITH_CYCLES_BLENDER)
-       add_subdirectory(blender)
        add_definitions(-DBLENDER_PLUGIN)
+       add_subdirectory(blender)
 endif(WITH_CYCLES_BLENDER)
 
 add_subdirectory(app)
index b34b56f31ed932307b10a3a1604abadb43f9ef33..4b7adbc10643b11a38fe27c04236af37f8db92d8 100644 (file)
@@ -2618,11 +2618,8 @@ static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *s
                                else
                                        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;
-                                       if(!tip)
-                                               tip= item[i].description;
-                               }
                        }
                        str= BLI_dynstr_get_cstring(dynstr);
                        BLI_dynstr_free(dynstr);
index 513f084b6e8dbc9fb35d16b3b092377ca5e5a85d..93e974ddb20b765064864bfe5fec61b9f4d57592 100644 (file)
@@ -376,7 +376,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but)
                        data->totline++;
                }
 
-               if(but->type == ROW) {
+               if(ELEM(but->type, ROW, MENU)) {
                        EnumPropertyItem *item;
                        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].description[0]) {
                                                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++;
                                        }
                                        break;