Changeset View
Changeset View
Standalone View
Standalone View
source/blender/editors/interface/interface.c
| Context not available. | |||||
| { | { | ||||
| but->flag |= UI_BUT_DISABLED; | but->flag |= UI_BUT_DISABLED; | ||||
| but->disabled_info = info; | but->disabled_info = info; | ||||
| } | } | ||||
| static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p) | static void ui_def_but_rna__menu(bContext *UNUSED(C), uiLayout *layout, void *but_p) | ||||
| { | { | ||||
| uiBlock *block = uiLayoutGetBlock(layout); | uiBlock *block = uiLayoutGetBlock(layout); | ||||
| uiPopupBlockHandle *handle = block->handle; | uiPopupBlockHandle *handle = block->handle; | ||||
| uiBut *but = (uiBut *)but_p; | uiBut *but = (uiBut *)but_p; | ||||
| bool has_categories = false; | |||||
| /* see comment in ui_item_enum_expand, re: uiname */ | /* see comment in ui_item_enum_expand, re: uiname */ | ||||
| const EnumPropertyItem *item, *item_array; | const EnumPropertyItem *item, *item_array; | ||||
| bool free; | bool free; | ||||
| uiLayout *split, *column = NULL; | uiLayout *split, *column = NULL; | ||||
| int totitems = 0; | int totitems = 0; | ||||
| int columns, rows, a, b; | int columns, rows, a, b; | ||||
| int column_end = 0; | int column_end = 0; | ||||
| Context not available. | |||||
| block->evil_C, &but->rnapoin, but->rnaprop, &item_array, NULL, &free); | block->evil_C, &but->rnapoin, but->rnaprop, &item_array, NULL, &free); | ||||
| /* we dont want nested rows, cols in menus */ | /* we dont want nested rows, cols in menus */ | ||||
| UI_block_layout_set_current(block, layout); | UI_block_layout_set_current(block, layout); | ||||
| for (item = item_array; item->identifier; item++, totitems++) { | for (item = item_array; item->identifier; item++, totitems++) { | ||||
| if (!item->identifier[0]) { | if (!item->identifier[0]) { | ||||
| /* inconsistent, but menus with categories do not look good flipped */ | /* inconsistent, but menus with categories do not look good flipped */ | ||||
| if (item->name) { | if (item->name) { | ||||
| block->flag |= UI_BLOCK_NO_FLIP; | block->flag |= UI_BLOCK_NO_FLIP; | ||||
| has_categories = true; | |||||
| nbr_entries_nosepr++; | nbr_entries_nosepr++; | ||||
| } | } | ||||
| /* We do not want simple separators in nbr_entries_nosepr count */ | /* We do not want simple separators in nbr_entries_nosepr count */ | ||||
| continue; | continue; | ||||
| } | } | ||||
| nbr_entries_nosepr++; | nbr_entries_nosepr++; | ||||
| } | } | ||||
| /* Columns and row estimation. Ignore simple separators here. */ | /* Columns and row estimation. Ignore simple separators here. */ | ||||
| columns = (nbr_entries_nosepr + 20) / 20; | columns = (nbr_entries_nosepr + 20) / 20; | ||||
| Context not available. | |||||
| } | } | ||||
| rows = totitems / columns; | rows = totitems / columns; | ||||
| if (rows < 1) { | if (rows < 1) { | ||||
| rows = 1; | rows = 1; | ||||
| } | } | ||||
| while (rows * columns < totitems) { | while (rows * columns < totitems) { | ||||
| rows++; | rows++; | ||||
| } | } | ||||
| if (block->flag & UI_BLOCK_NO_FLIP) { | char *title = RNA_property_ui_name(but->rnaprop); | ||||
| if (block->flag & UI_BLOCK_NO_FLIP && !has_categories && title[0]) { | |||||
| /* Title at the top for menus with categories. */ | /* Title at the top for menus with categories. */ | ||||
| uiDefBut(block, | uiDefBut(block, | ||||
| UI_BTYPE_LABEL, | UI_BTYPE_LABEL, | ||||
| 0, | 0, | ||||
| RNA_property_ui_name(but->rnaprop), | RNA_property_ui_name(but->rnaprop), | ||||
| 0, | 0, | ||||
| 0, | 0, | ||||
| UI_UNIT_X * 5, | UI_UNIT_X * 5, | ||||
| UI_UNIT_Y, | UI_UNIT_Y, | ||||
| NULL, | NULL, | ||||
| Context not available. | |||||
| 0, | 0, | ||||
| ""); | ""); | ||||
| uiItemS(layout); | uiItemS(layout); | ||||
| } | } | ||||
| /* note, item_array[...] is reversed on access */ | /* note, item_array[...] is reversed on access */ | ||||
| /* create items */ | /* create items */ | ||||
| split = uiLayoutSplit(layout, 0.0f, false); | split = uiLayoutSplit(layout, 0.0f, false); | ||||
| bool top_of_column = false; | |||||
| for (a = 0; a < totitems; a++) { | for (a = 0; a < totitems; a++) { | ||||
| if (a == column_end) { | if (a == column_end) { | ||||
| /* start new column, and find out where it ends in advance, so we | /* start new column, and find out where it ends in advance, so we | ||||
| * can flip the order of items properly per column */ | * can flip the order of items properly per column */ | ||||
| column_end = totitems; | column_end = totitems; | ||||
| for (b = a + 1; b < totitems; b++) { | for (b = a + 1; b < totitems; b++) { | ||||
| item = &item_array[b]; | item = &item_array[b]; | ||||
| /* new column on N rows or on separation label */ | /* new column on N rows or on separation label */ | ||||
| if (((b - a) % rows == 0) || (!item->identifier[0] && item->name)) { | if (((b - a) % rows == 0) || (!item->identifier[0] && item->name)) { | ||||
| column_end = b; | column_end = b; | ||||
| break; | break; | ||||
| } | } | ||||
| } | } | ||||
| column = uiLayoutColumn(split, false); | column = uiLayoutColumn(split, false); | ||||
| top_of_column = true; | |||||
| } | } | ||||
| item = &item_array[a]; | item = &item_array[a]; | ||||
| if (has_categories && top_of_column && item->identifier[0]) { | |||||
| uiItemL(column, "", ICON_NONE); | |||||
| uiItemS(column); | |||||
| } | |||||
| if (!item->identifier[0]) { | if (!item->identifier[0]) { | ||||
| if (item->name) { | if (item->name) { | ||||
| if (item->icon) { | if (item->icon) { | ||||
| uiItemL(column, item->name, item->icon); | uiItemL(column, item->name, item->icon); | ||||
| } | } | ||||
| else { | else { | ||||
| /* Do not use uiItemL here, as our root layout is a menu one, | /* Do not use uiItemL here, as our root layout is a menu one, | ||||
| * it will add a fake blank icon! */ | * it will add a fake blank icon! */ | ||||
| uiDefBut(block, | uiDefBut(block, | ||||
| UI_BTYPE_LABEL, | UI_BTYPE_LABEL, | ||||
| Context not available. | |||||
| 0, | 0, | ||||
| UI_UNIT_X * 5, | UI_UNIT_X * 5, | ||||
| UI_UNIT_Y, | UI_UNIT_Y, | ||||
| NULL, | NULL, | ||||
| 0.0, | 0.0, | ||||
| 0.0, | 0.0, | ||||
| 0, | 0, | ||||
| 0, | 0, | ||||
| ""); | ""); | ||||
| } | } | ||||
| } | |||||
| else { | |||||
| uiItemS(column); | uiItemS(column); | ||||
| } | } | ||||
| } | } | ||||
| else { | else { | ||||
| if (item->icon) { | if (item->icon) { | ||||
| uiDefIconTextButI(block, | uiDefIconTextButI(block, | ||||
| UI_BTYPE_BUT_MENU, | UI_BTYPE_BUT_MENU, | ||||
| B_NOP, | B_NOP, | ||||
| item->icon, | item->icon, | ||||
| item->name, | item->name, | ||||
| Context not available. | |||||
| UI_UNIT_X * 5, | UI_UNIT_X * 5, | ||||
| UI_UNIT_X, | UI_UNIT_X, | ||||
| &handle->retvalue, | &handle->retvalue, | ||||
| item->value, | item->value, | ||||
| 0.0, | 0.0, | ||||
| 0, | 0, | ||||
| -1, | -1, | ||||
| item->description); | item->description); | ||||
| } | } | ||||
| } | } | ||||
| top_of_column = false; | |||||
| } | } | ||||
| if (!(block->flag & UI_BLOCK_NO_FLIP)) { | if (!(block->flag & UI_BLOCK_NO_FLIP) && !has_categories && title[0]) { | ||||
| /* Title at the bottom for menus without categories. */ | /* Title at the bottom for menus without categories. */ | ||||
| uiItemS(layout); | uiItemS(layout); | ||||
| uiDefBut(block, | uiDefBut(block, | ||||
| UI_BTYPE_LABEL, | UI_BTYPE_LABEL, | ||||
| 0, | 0, | ||||
| RNA_property_ui_name(but->rnaprop), | RNA_property_ui_name(but->rnaprop), | ||||
| 0, | 0, | ||||
| 0, | 0, | ||||
| UI_UNIT_X * 5, | UI_UNIT_X * 5, | ||||
| UI_UNIT_Y, | UI_UNIT_Y, | ||||
| Context not available. | |||||
angavrilov: Is it intentional that menus without named categories completely lose the capability to have… | |||||
Not Done Inline ActionsI would recommend an explicit comparison to 0 here so it's clear the variable is an int. HooglyBoogly: I would recommend an explicit comparison to 0 here so it's clear the variable is an int. | |||||
Is it intentional that menus without named categories completely lose the capability to have simple separators?