[Bf-blender-cvs] [9cda01caf7d] master: UI: don't align popover buttons with opened popovers
Yevgeny Makarov
noreply at git.blender.org
Tue Oct 1 20:12:43 CEST 2019
Commit: 9cda01caf7d276ef678cbad93af0f55c37544e29
Author: Yevgeny Makarov
Date: Tue Oct 1 19:34:03 2019 +0200
Branches: master
https://developer.blender.org/rB9cda01caf7d276ef678cbad93af0f55c37544e29
UI: don't align popover buttons with opened popovers
Differential Revision: https://developer.blender.org/D5890
===================================================================
M source/blender/editors/interface/interface_widgets.c
===================================================================
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 0ee2ed0f338..6d2d5ddd5b9 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4521,7 +4521,7 @@ static int widget_roundbox_set(uiBut *but, rcti *rect)
}
/* align with open menu */
- if (but->active && (but->type != UI_BTYPE_POPOVER)) {
+ if (but->active && (but->type != UI_BTYPE_POPOVER) && !ui_but_menu_draw_as_popover(but)) {
int direction = ui_but_menu_direction(but);
if (direction == UI_DIR_UP) {
More information about the Bf-blender-cvs
mailing list