diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-09 22:05:50 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-09 22:05:50 +0400 |
commit | 860fce4eb97e4961065afad76f7b0915600b1ddb (patch) | |
tree | 3959f6c2154ce2ad1482e13bbde5d8e67b4d4f8f /source/blender/editors/interface/interface_regions.c | |
parent | 13b3b425f8ed2fdedd15b828c1c7b3559f2a2b66 (diff) |
Code cleanup: removed some unused UI button types
* CHARTAB: not needed anymore with improved copy/paste support and text input.
* IDPOIN: replaced by SEARCH_MENU.
* ICONROW/ICONTEXTROW: replaced by RNA enums.
* NUMABS: can use min/max limits instead.
* BUT_TOGDUAL, TOG3, TOGR, SLI: not used in 2.5 interface.
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 3b9574156eb..8621a61a2d1 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -481,7 +481,7 @@ ARegion *ui_tooltip_create(bContext *C, ARegion *butregion, uiBut *but) data->totline++; } - if (ELEM4(but->type, TEX, IDPOIN, SEARCH_MENU, SEARCH_MENU_UNLINK)) { + if (ELEM3(but->type, TEX, SEARCH_MENU, SEARCH_MENU_UNLINK)) { /* full string */ ui_get_but_string(but, buf, sizeof(buf)); if (buf[0]) { @@ -1866,53 +1866,6 @@ static void ui_block_func_MENUSTR(bContext *UNUSED(C), uiLayout *layout, void *a menudata_free(md); } -void ui_block_func_ICONROW(bContext *UNUSED(C), uiLayout *layout, void *arg_but) -{ - uiBlock *block = uiLayoutGetBlock(layout); - uiPopupBlockHandle *handle = block->handle; - uiBut *but = arg_but; - int a; - - uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); - - for (a = (int)but->hardmin; a <= (int)but->hardmax; a++) - uiDefIconButF(block, BUTM, B_NOP, but->icon + (a - but->hardmin), 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, - &handle->retvalue, (float)a, 0.0, 0, -1, ""); -} - -void ui_block_func_ICONTEXTROW(bContext *UNUSED(C), uiLayout *layout, void *arg_but) -{ - uiBlock *block = uiLayoutGetBlock(layout); - uiPopupBlockHandle *handle = block->handle; - uiBut *but = arg_but, *bt; - MenuData *md; - MenuEntry *entry; - int a; - - uiBlockSetFlag(block, UI_BLOCK_MOVEMOUSE_QUIT); - - md = decompose_menu_string(but->str); - - /* title */ - if (md->title) { - bt = uiDefBut(block, LABEL, 0, md->title, 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, ""); - bt->flag = UI_TEXT_LEFT; - } - - /* loop through the menu options and draw them out with icons & text labels */ - for (a = 0; a < md->nitems; a++) { - entry = &md->items[md->nitems - a - 1]; - - if (entry->sepr) - uiItemS(layout); - else - uiDefIconTextButF(block, BUTM, B_NOP, (short)((but->icon) + (entry->retval - but->hardmin)), entry->str, - 0, 0, UI_UNIT_X * 5, UI_UNIT_Y, &handle->retvalue, (float) entry->retval, 0.0, 0, -1, ""); - } - - menudata_free(md); -} - #if 0 static void ui_warp_pointer(int x, int y) { |