[Bf-blender-cvs] [92404dd48d8] blender2.8: UI: popover now use menu style buttons

Campbell Barton noreply at git.blender.org
Sun Apr 22 18:40:26 CEST 2018


Commit: 92404dd48d89027a0b75651b32dc7fe4e3172cda
Author: Campbell Barton
Date:   Sun Apr 22 18:39:29 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB92404dd48d89027a0b75651b32dc7fe4e3172cda

UI: popover now use menu style buttons

Also scale width with UI-scale.

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

M	source/blender/editors/interface/interface_region_popover.c
M	source/blender/editors/interface/interface_widgets.c

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

diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c
index 035efb368a6..1f5143981b2 100644
--- a/source/blender/editors/interface/interface_region_popover.c
+++ b/source/blender/editors/interface/interface_region_popover.c
@@ -162,7 +162,8 @@ uiPopupBlockHandle *ui_popover_panel_create(
 	pup = MEM_callocN(sizeof(uiPopover), __func__);
 	pup->block = UI_block_begin(C, NULL, __func__, UI_EMBOSS);
 	UI_block_emboss_set(pup->block, UI_EMBOSS);
-	pup->layout = UI_block_layout(pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 200, 0, MENU_PADDING, style);
+	pup->layout = UI_block_layout(
+	        pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, U.widget_unit * 10, 0, MENU_PADDING, style);
 	pup->slideout = false; // but ? ui_block_is_menu(but->block) : false;
 	pup->but = but;
 	uiLayoutSetOperatorContext(pup->layout, WM_OP_INVOKE_REGION_WIN);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index f1b1ef44bef..ea4dc831ac2 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface/interface_widgets.c
@@ -4266,7 +4266,11 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct
 					}
 				}
 				break;
-				
+
+			case UI_BTYPE_POPOVER:
+				wt = widget_type(UI_WTYPE_PULLDOWN);
+				break;
+
 			case UI_BTYPE_PULLDOWN:
 				wt = widget_type(UI_WTYPE_PULLDOWN);
 				break;



More information about the Bf-blender-cvs mailing list