UI: enum property menus now expand down, consistent with other menus.
Differential Revision: https://developer.blender.org/D4359
This commit is contained in:
parent
d6b5ee99fe
commit
4dd575e5ab
Notes:
blender-bot
2023-02-14 06:00:47 +01:00
Referenced by commit 6e95d8484c
, Fix upside down tool menus
Referenced by issue #62216, Mode menu order is flipped
|
@ -193,19 +193,12 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
|
|||
minwidth = UI_MENU_WIDTH_MIN;
|
||||
}
|
||||
|
||||
/* settings (typically rna-enum-popups) show above the button,
|
||||
* menu's like file-menu, show below */
|
||||
if (pup->block->direction != 0) {
|
||||
/* allow overriding the direction from menu_func */
|
||||
direction = pup->block->direction;
|
||||
}
|
||||
else if ((pup->but->type == UI_BTYPE_PULLDOWN) ||
|
||||
(UI_but_menutype_get(pup->but) != NULL))
|
||||
{
|
||||
direction = UI_DIR_DOWN;
|
||||
}
|
||||
else {
|
||||
direction = UI_DIR_UP;
|
||||
direction = UI_DIR_DOWN;
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
@ -229,6 +222,13 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
|
|||
|
||||
UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT);
|
||||
|
||||
/* Flip layout because rna enum list ordered in reverse. */
|
||||
if ((pup->but && pup->but->type != UI_BTYPE_PULLDOWN) &&
|
||||
(UI_but_menutype_get(pup->but) == NULL))
|
||||
{
|
||||
UI_block_order_flip(block);
|
||||
}
|
||||
|
||||
if (pup->popup) {
|
||||
uiBut *bt;
|
||||
int offset[2];
|
||||
|
|
Loading…
Reference in New Issue