[Bf-blender-cvs] [05dfd85] master: UI: fix for issue in last commit, popups show above the buttons again

Campbell Barton noreply at git.blender.org
Mon Feb 10 03:46:17 CET 2014


Commit: 05dfd852ec629414acfca66348795ad32ef81f24
Author: Campbell Barton
Date:   Mon Feb 10 13:44:59 2014 +1100
https://developer.blender.org/rB05dfd852ec629414acfca66348795ad32ef81f24

UI: fix for issue in last commit, popups show above the buttons again

===================================================================

M	source/blender/editors/interface/interface_regions.c

===================================================================

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 7d78be3..2adf18c 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;
 		}




More information about the Bf-blender-cvs mailing list