archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: enum property menus now expand down, consistent with other menus.

Browse Source 
Differential Revision: https://developer.blender.org/D4359
This commit is contained in:
Mikhail Rachinskiy
2019-02-21 18:16:25 +01:00
committed by Brecht Van Lommel
parent d6b5ee99fe
commit 4dd575e5ab
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/interface/interface_region_menu_popup.c
View File

@@ -193,19 +193,12 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
minwidth = UI_MENU_WIDTH_MIN; 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) { if (pup->block->direction != 0) {
/* allow overriding the direction from menu_func */ /* allow overriding the direction from menu_func */
direction = pup->block->direction; direction = pup->block->direction;
} }
else if ((pup->but->type == UI_BTYPE_PULLDOWN) ||
(UI_but_menutype_get(pup->but) != NULL))
{
direction = UI_DIR_DOWN;
}
else { else {
direction = UI_DIR_UP; direction = UI_DIR_DOWN;
} }
} }
else { 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); 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) { if (pup->popup) {
uiBut *bt; uiBut *bt;
int offset[2]; int offset[2];