diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-10 06:44:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-10 06:44:59 +0400 |
| commit | 05dfd852ec629414acfca66348795ad32ef81f24 (patch) | |
| tree | 65dbeb511a899d962d56be64087efe4ccb1d3c85 /source/blender/editors/interface/interface_regions.c | |
| parent | 35f62bdced41b8960c90ad20a2f90809c4b677e9 (diff) | |
UI: fix for issue in last commit, popups show above the buttons again
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 7d78be3558a..2adf18ce334 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2113,7 +2113,9 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi /* minimum width to enforece */ minwidth = BLI_rctf_size_x(&pup->but->rect); - if (pup->but->type == PULLDOWN || pup->but->menu_create_func) { + /* settings (typically rna-enum-popups) show above the button, + * menu's like file-menu, show below */ + if (pup->but->type == PULLDOWN || (uiButGetMenuType(pup->but) != NULL)) { direction = UI_DOWN; flip = 1; } |