From cc1d6b849de2c237bb0079bcf5d7967528b3c504 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 11 Oct 2018 17:42:50 +0200 Subject: Fix T56898: misaligned icons in buttons in popovers. --- .../blender/editors/interface/interface_region_popover.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source/blender/editors/interface/interface_region_popover.c') diff --git a/source/blender/editors/interface/interface_region_popover.c b/source/blender/editors/interface/interface_region_popover.c index b71152fcd19..cb4939adc56 100644 --- a/source/blender/editors/interface/interface_region_popover.c +++ b/source/blender/editors/interface/interface_region_popover.c @@ -100,7 +100,15 @@ static void ui_popover_create_block(bContext *C, uiPopover *pup, int opcontext) BLI_assert(pup->ui_size_x != 0); uiStyle *style = UI_style_get_dpi(); + pup->block = UI_block_begin(C, NULL, __func__, UI_EMBOSS); + UI_block_flag_enable(pup->block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_POPOVER); +#ifdef USE_UI_POPOVER_ONCE + if (pup->is_once) { + UI_block_flag_enable(pup->block, UI_BLOCK_POPOVER_ONCE); + } +#endif + pup->layout = UI_block_layout( pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, pup->ui_size_x, 0, MENU_PADDING, style); @@ -139,12 +147,6 @@ static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, v UI_block_region_set(block, handle->region); UI_block_layout_resolve(block, &width, &height); - UI_block_flag_enable(block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_POPOVER); -#ifdef USE_UI_POPOVER_ONCE - if (pup->is_once) { - UI_block_flag_enable(block, UI_BLOCK_POPOVER_ONCE); - } -#endif UI_block_direction_set(block, UI_DIR_DOWN | UI_DIR_CENTER_X); const int block_margin = U.widget_unit / 2; -- cgit v1.2.3