Initial popover working

release/scripts/modules/bpy_types.py

@@ -144,6 +144,15 @@ class WindowManager(bpy_types.ID):
         finally:
             self.popmenu_end__internal(popup)
 
+    def popover_menu(self, draw_func, title="", icon='NONE'):
+        import bpy
+        popup = self.popover_begin__internal(title, icon)
+
+        try:
+            draw_func(popup, bpy.context)
+        finally:
+            self.popover_end__internal(popup)
+
     def popup_menu_pie(self, event, draw_func, title="", icon='NONE'):
         import bpy
         pie = self.piemenu_begin__internal(title, icon, event)

release/scripts/startup/bl_ui/space_topbar.py

@@ -119,6 +119,16 @@ class TOPBAR_HT_lower_bar(Header):
         # Placeholder
         layout.operator("ed.undo_history", text="...")
 
+        # Last Action (redo)
+        layout.label("Last Action:")
+        operators = context.window_manager.operators
+        op = operators[-1] if operators else None
+        row = layout.row()
+        row.enabled = op is not None
+        row.popover("VIEW3D_PT_last_operator", text=op.name if op else "Last Action...")
+
+        # layout.popover("SCENE_PT_scene")
+
 
 class INFO_MT_editor_menus(Menu):
     bl_idname = "INFO_MT_editor_menus"

source/blender/editors/include/UI_interface.h

@@ -265,6 +265,7 @@ typedef enum {
 	UI_BTYPE_CHECKBOX_N             = (14 << 9),
 	UI_BTYPE_COLOR                  = (15 << 9),
 	UI_BTYPE_TAB                    = (16 << 9),
+	UI_BTYPE_POPOVER                = (17 << 9),
 	UI_BTYPE_SCROLL                 = (18 << 9),
 	UI_BTYPE_BLOCK                  = (19 << 9),
 	UI_BTYPE_LABEL                  = (20 << 9),
@@ -409,6 +410,26 @@ int UI_popup_menu_invoke(struct bContext *C, const char *idname, struct ReportLi
 void UI_popup_menu_retval_set(const uiBlock *block, const int retval, const bool enable);
 void UI_popup_menu_but_set(uiPopupMenu *pup, struct ARegion *butregion, uiBut *but);
 
+/* interface_region_menu_popover.c */
+
+typedef struct uiPopoverMenu uiPopoverMenu;
+
+uiPopoverMenu *UI_popover_menu_begin(
+        struct bContext *C) ATTR_NONNULL();
+uiPopoverMenu *UI_popover_menu_begin_ex(
+        struct bContext *C, const char *block_name) ATTR_NONNULL();
+void UI_popover_menu_end(struct bContext *C, struct uiPopoverMenu *head);
+struct uiLayout *UI_popover_menu_layout(uiPopoverMenu *head);
+
+int UI_popover_menu_invoke(struct bContext *C, const char *idname, struct ReportList *reports) ATTR_NONNULL(1, 2);
+
+/* Popover Blocks
+ *
+ * Functions used to create popup blocks. These are like popup menus
+ * but allow using all button types and creating an own layout. */
+typedef uiBlock * (*uiBlockCreateFunc)(struct bContext *C, struct ARegion *ar, void *arg1);
+typedef void (*uiBlockCancelFunc)(struct bContext *C, void *arg1);
+
 /* interface_region_menu_pie.c */
 /* Pie menus */
 typedef struct uiPieMenu uiPieMenu;
@@ -911,6 +932,7 @@ void uiLayoutSetContextPointer(uiLayout *layout, const char *name, struct Pointe
 void uiLayoutContextCopy(uiLayout *layout, struct bContextStore *context);
 const char *uiLayoutIntrospect(uiLayout *layout); // XXX - testing
 struct MenuType *UI_but_menutype_get(uiBut *but);
+struct PanelType *UI_but_paneltype_get(uiBut *but);
 void UI_menutype_draw(struct bContext *C, struct MenuType *mt, struct uiLayout *layout);
 
 /* Only for convenience. */
@@ -1087,6 +1109,7 @@ void uiItemsFullEnumO_items(
 void uiItemL(uiLayout *layout, const char *name, int icon); /* label */
 void uiItemLDrag(uiLayout *layout, struct PointerRNA *ptr, const char *name, int icon); /* label icon for dragging */
 void uiItemM(uiLayout *layout, struct bContext *C, const char *menuname, const char *name, int icon); /* menu */
+void uiItemP(uiLayout *layout, struct bContext *C, const char *panelname, const char *name, int icon);
 void uiItemV(uiLayout *layout, const char *name, int icon, int argval); /* value */
 void uiItemS(uiLayout *layout); /* separator */
 

source/blender/editors/interface/CMakeLists.txt

@@ -59,6 +59,7 @@ set(SRC
 	interface_region_color_picker.c
 	interface_region_menu_pie.c
 	interface_region_menu_popup.c
+	interface_region_menu_popover.c
 	interface_region_popup.c
 	interface_region_search.c
 	interface_region_tooltip.c

source/blender/editors/interface/interface_handlers.c

@@ -3431,6 +3431,7 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 	uiBlockCreateFunc func = NULL;
 	uiBlockHandleCreateFunc handlefunc = NULL;
 	uiMenuCreateFunc menufunc = NULL;
+	uiMenuCreateFunc popoverfunc = NULL;
 	void *arg = NULL;
 
 	switch (but->type) {
@@ -3450,6 +3451,11 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 			menufunc = but->menu_create_func;
 			arg = but->poin;
 			break;
+		case UI_BTYPE_POPOVER:
+			BLI_assert(but->menu_create_func);
+			popoverfunc = but->menu_create_func;
+			arg = but->poin;
+			break;
 		case UI_BTYPE_COLOR:
 			ui_but_v3_get(but, data->origvec);
 			copy_v3_v3(data->vec, data->origvec);
@@ -3474,6 +3480,11 @@ static void ui_block_open_begin(bContext *C, uiBut *but, uiHandleButtonData *dat
 		if (but->block->handle)
 			data->menu->popup = but->block->handle->popup;
 	}
+	else if (popoverfunc) {
+		data->menu = ui_popover_menu_create(C, data->region, but, popoverfunc, arg);
+		if (but->block->handle)
+			data->menu->popup = but->block->handle->popup;
+	}
 
 #ifdef USE_ALLSELECT
 	{
@@ -7046,6 +7057,7 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, const wmEvent *
 			retval = ui_do_but_TEX(C, block, but, data, event);
 			break;
 		case UI_BTYPE_MENU:
+		case UI_BTYPE_POPOVER:
 		case UI_BTYPE_BLOCK:
 		case UI_BTYPE_PULLDOWN:
 			retval = ui_do_but_BLOCK(C, but, data, event);

source/blender/editors/interface/interface_intern.h

@@ -615,6 +615,18 @@ uiPopupBlockHandle *ui_popup_menu_create(
         struct bContext *C, struct ARegion *butregion, uiBut *but,
         uiMenuCreateFunc create_func, void *arg);
 
+/* interface_region_menu_popover.c */
+uiBlock *ui_popover_block_refresh(
+        struct bContext *C, uiPopupBlockHandle *handle,
+        ARegion *butregion, uiBut *but);
+uiPopupBlockHandle *ui_popover_block_create(
+        struct bContext *C, struct ARegion *butregion, uiBut *but,
+        uiBlockCreateFunc create_func, uiBlockHandleCreateFunc handle_create_func,
+        void *arg);
+uiPopupBlockHandle *ui_popover_menu_create(
+        struct bContext *C, struct ARegion *butregion, uiBut *but,
+        uiMenuCreateFunc create_func, void *arg);
+
 /* interface_region_menu_pie.c */
 void ui_pie_menu_level_create(
         uiBlock *block, struct wmOperatorType *ot, const char *propname, IDProperty *properties,

source/blender/editors/interface/interface_layout.c

@@ -1824,6 +1824,28 @@ static void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt)
 	layout->root->block->flag ^= UI_BLOCK_IS_FLIP;
 }
 
+static void ui_item_paneltype_func(bContext *C, uiLayout *layout, void *arg_mt)
+{
+	PanelType *pt = (PanelType *)arg_mt;
+
+	/* TODO: move into UI_paneltype_draw */
+	Panel *pa = MEM_callocN(sizeof(Panel), "popover panel");
+	pa->type = pt;
+	pa->layout = layout;
+
+	if (layout->context) {
+		CTX_store_set(C, layout->context);
+	}
+
+	pt->draw(C, pa);
+
+	if (layout->context) {
+		CTX_store_set(C, NULL);
+	}
+
+	MEM_freeN(pa);
+}
+
 static uiBut *ui_item_menu(
         uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg, void *argN,
         const char *tip, bool force_menu)
@@ -1901,6 +1923,42 @@ void uiItemM(uiLayout *layout, bContext *UNUSED(C), const char *menuname, const
 	ui_item_menu(layout, name, icon, ui_item_menutype_func, mt, NULL, TIP_(mt->description), false);
 }
 
+/* popover */
+void uiItemP(uiLayout *layout, bContext *UNUSED(C), const char *panelname, const char *name, int icon)
+{
+	PanelType *pt_;
+
+	pt_ = NULL; // WM_menutype_find(menuname, false);
+	/* XXX, slow! */
+	{
+		const ListBase *lb = BKE_spacetypes_list();
+		for (const SpaceType *st = lb->first; st; st = st->next) {
+			for (const ARegionType *art = st->regiontypes.first; art; art = art->next) {
+				for (PanelType *pt = art->paneltypes.first; pt; pt = pt->next) {
+					if (STREQ(pt->idname, panelname)) {
+						pt_ = pt;
+					}
+				}
+			}
+		}
+	}
+
+	if (pt_ == NULL) {
+		RNA_warning("not found %s", panelname);
+		return;
+	}
+
+	if (!name) {
+		name = CTX_IFACE_(mt->translation_context, pt_->label);
+	}
+
+	if (layout->root->type == UI_LAYOUT_MENU && !icon)
+		icon = ICON_BLANK1;
+
+	uiBut *but = ui_item_menu(layout, name, icon, ui_item_paneltype_func, pt_, NULL, NULL, false);
+	but->type = UI_BTYPE_POPOVER;
+}
+
 /* label item */
 static uiBut *uiItemL_(uiLayout *layout, const char *name, int icon)
 {
@@ -3604,6 +3662,18 @@ MenuType *UI_but_menutype_get(uiBut *but)
 	}
 }
 
+/* this is a bit of a hack but best keep it in one place at least */
+PanelType *UI_but_paneltype_get(uiBut *but)
+{
+	if (but->menu_create_func == ui_item_paneltype_func) {
+		return (PanelType *)but->poin;
+	}
+	else {
+		return NULL;
+	}
+}
+
+
 void UI_menutype_draw(bContext *C, MenuType *mt, struct uiLayout *layout)
 {
 	Menu menu = {

source/blender/editors/interface/interface_region_menu_popover.c

@@ -0,0 +1,322 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2008 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/interface/interface_region_menu_popover.c
+ *  \ingroup edinterface
+ *
+ * Pop-Over Region
+ *
+ * \note This is very close to 'interface_region_menu_popover.c'
+ *
+ * We could even merge them, however menu logic is already over-loaded.
+ * PopOver's have the following differences.
+ *
+ * - UI is not constrained to a list (more like a popover panel).
+ * - Pressing a button won't close the pop-over.
+ * - Different draw style (to show this is has different behavior from a menu).
+ * - #PanelType are used insetead of #MenuType.
+ * - No menu flipping support.
+ * - No moving the menu to fit the mouse cursor.
+ * - No key accelerators to access menu items
+ *   (if we add support they would work differently).
+ * - No arrow key navigation.
+ * - No menu memory.
+ * - No title.
+ *
+ * Other differences:
+ * - Uses panel layout type.
+ */
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_userdef_types.h"
+
+#include "BLI_math.h"
+#include "BLI_listbase.h"
+
+#include "BLI_string.h"
+#include "BLI_rect.h"
+#include "BLI_utildefines.h"
+#include "BLI_ghash.h"
+
+#include "BKE_context.h"
+#include "BKE_screen.h"
+#include "BKE_report.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "RNA_access.h"
+
+#include "UI_interface.h"
+
+#include "BLT_translation.h"
+
+#include "ED_screen.h"
+
+#include "interface_intern.h"
+#include "interface_regions_intern.h"
+
+/* -------------------------------------------------------------------- */
+/** \name Popup Menu with Callback or String
+ * \{ */
+
+struct uiPopoverMenu {
+	uiBlock *block;
+	uiLayout *layout;
+	uiBut *but;
+	ARegion *butregion;
+
+	int mx, my;
+	bool popover, slideout;
+
+	uiMenuCreateFunc menu_func;
+	void *menu_arg;
+};
+
+static uiBlock *ui_block_func_POPOVER(bContext *C, uiPopupBlockHandle *handle, void *arg_pup)
+{
+	uiBlock *block;
+	uiPopoverMenu *pup = arg_pup;
+	int offset[2], minwidth, width, height;
+
+	if (pup->menu_func) {
+		pup->block->handle = handle;
+		pup->menu_func(C, pup->layout, pup->menu_arg);
+		pup->block->handle = NULL;
+	}
+
+	if (pup->but) {
+		/* minimum width to enforece */
+		minwidth = BLI_rctf_size_x(&pup->but->rect);
+	}
+	else {
+		minwidth = 50;
+	}
+
+	block = pup->block;
+
+	/* in some cases we create the block before the region,
+	 * so we set it delayed here if necessary */
+	if (BLI_findindex(&handle->region->uiblocks, block) == -1)
+		UI_block_region_set(block, handle->region);
+
+	block->direction = UI_DIR_DOWN;
+
+	UI_block_layout_resolve(block, &width, &height);
+
+	UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT);
+
+	if (pup->popover) {
+		UI_block_flag_enable(block, UI_BLOCK_LOOP);
+		UI_block_direction_set(block, block->direction);
+		block->minbounds = minwidth;
+		UI_block_bounds_set_popup(block, 1, offset[0], offset[1]);
+	}
+	else {
+		/* for a header menu we set the direction automatic */
+		block->minbounds = minwidth;
+		UI_block_bounds_set_normal(block, 1);
+	}
+
+	/* if menu slides out of other menu, override direction */
+	if (pup->slideout)
+		UI_block_direction_set(block, UI_DIR_RIGHT);
+
+	return pup->block;
+}
+
+uiPopupBlockHandle *ui_popover_menu_create(
+        bContext *C, ARegion *butregion, uiBut *but,
+        uiMenuCreateFunc menu_func, void *arg)
+{
+	wmWindow *window = CTX_wm_window(C);
+	uiStyle *style = UI_style_get_dpi();
+	uiPopupBlockHandle *handle;
+	uiPopoverMenu *pup;
+
+	pup = MEM_callocN(sizeof(uiPopoverMenu), __func__);
+	pup->block = UI_block_begin(C, NULL, __func__, UI_EMBOSS);
+#if 0
+	pup->block->flag |= UI_BLOCK_NUMSELECT;  /* default menus to numselect */
+#endif
+	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->slideout = false; // but ? ui_block_is_menu(but->block) : false;
+	pup->but = but;
+	uiLayoutSetOperatorContext(pup->layout, WM_OP_INVOKE_REGION_WIN);
+
+	if (!but) {
+		/* no button to start from, means we are a popover */
+		pup->mx = window->eventstate->x;
+		pup->my = window->eventstate->y;
+		pup->popover = true;
+		pup->block->flag |= UI_BLOCK_NO_FLIP;
+	}
+	/* some enums reversing is strange, currently we have no good way to
+	 * reverse some enum's but not others, so reverse all so the first menu
+	 * items are always close to the mouse cursor */
+	else {
+		if (but->context)
+			uiLayoutContextCopy(pup->layout, but->context);
+	}
+
+	/* menu is created from a callback */
+	pup->menu_func = menu_func;
+	pup->menu_arg = arg;
+
+	handle = ui_popup_block_create(C, butregion, but, NULL, ui_block_func_POPOVER, pup);
+
+	if (!but) {
+		handle->popup = true;
+
+		UI_popup_handlers_add(C, &window->modalhandlers, handle, 0);
+		WM_event_add_mousemove(C);
+	}
+
+	handle->can_refresh = false;
+	MEM_freeN(pup);
+
+	return handle;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Popup Menu API with begin & end
+ * \{ */
+
+/**
+ * Only return handler, and set optional title.
+ * \param block_name: Assigned to uiBlock.name (useful info for debugging).
+ */
+uiPopoverMenu *UI_popover_menu_begin_ex(bContext *C, const char *block_name)
+{
+	uiStyle *style = UI_style_get_dpi();
+	uiPopoverMenu *pup = MEM_callocN(sizeof(uiPopoverMenu), "popover menu");
+
+	pup->block = UI_block_begin(C, NULL, block_name, UI_EMBOSS);
+#if 0        // POPUP
+	pup->block->flag |= UI_BLOCK_POPUP_MEMORY | UI_BLOCK_IS_FLIP;
+#endif
+	pup->layout = UI_block_layout(pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 200, 0, MENU_PADDING, style);
+
+	// POPUP - REVIEW
+	uiLayoutSetOperatorContext(pup->layout, WM_OP_EXEC_REGION_WIN);
+
+	/* create in advance so we can let buttons point to retval already */
+	pup->block->handle = MEM_callocN(sizeof(uiPopupBlockHandle), "uiPopupBlockHandle");
+
+	return pup;
+}
+
+uiPopoverMenu *UI_popover_menu_begin(bContext *C)
+{
+	return UI_popover_menu_begin_ex(C, __func__);
+}
+
+/**
+ * Setting the button makes the popover open from the button instead of the cursor.
+ */
+#if 0
+void UI_popover_menu_but_set(uiPopoverMenu *pup, struct ARegion *butregion, uiBut *but)
+{
+	pup->but = but;
+	pup->butregion = butregion;
+}
+#endif
+
+/* set the whole structure to work */
+void UI_popover_menu_end(bContext *C, uiPopoverMenu *pup)
+{
+	wmWindow *window = CTX_wm_window(C);
+	uiPopupBlockHandle *menu;
+	uiBut *but = NULL;
+	ARegion *butregion = NULL;
+
+	pup->popover = true;
+	pup->mx = window->eventstate->x;
+	pup->my = window->eventstate->y;
+
+	if (pup->but) {
+		but = pup->but;
+		butregion = pup->butregion;
+	}
+
+	menu = ui_popup_block_create(C, butregion, but, NULL, ui_block_func_POPOVER, pup);
+	menu->popup = true;
+
+	UI_popup_handlers_add(C, &window->modalhandlers, menu, 0);
+	WM_event_add_mousemove(C);
+
+	menu->can_refresh = false;
+	MEM_freeN(pup);
+}
+
+uiLayout *UI_popover_menu_layout(uiPopoverMenu *pup)
+{
+	return pup->layout;
+}
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Standard Popup Menus
+ * \{ */
+
+int UI_popover_menu_invoke(bContext *C, const char *idname, ReportList *reports)
+{
+	uiPopoverMenu *pup;
+	uiLayout *layout;
+	// PanelType *pt = WM_menutype_find(idname, true);
+	MenuType *mt = WM_menutype_find(idname, true);
+
+	if (mt == NULL) {
+		BKE_reportf(reports, RPT_ERROR, "Menu \"%s\" not found", idname);
+		return OPERATOR_CANCELLED;
+	}
+
+	if (WM_menutype_poll(C, mt) == false) {
+		/* cancel but allow event to pass through, just like operators do */
+		return (OPERATOR_CANCELLED | OPERATOR_PASS_THROUGH);
+	}
+
+	pup = UI_popover_menu_begin(C);
+	layout = UI_popover_menu_layout(pup);
+
+	UI_menutype_draw(C, mt, layout);
+
+	UI_popover_menu_end(C, pup);
+
+	return OPERATOR_INTERFACE;
+}
+
+/** \} */
+

source/blender/makesrna/RNA_access.h

@@ -664,6 +664,7 @@ extern StructRNA RNA_TransformSequence;
 extern StructRNA RNA_UILayout;
 extern StructRNA RNA_UIList;
 extern StructRNA RNA_UIPieMenu;
+extern StructRNA RNA_UIPopoverMenu;
 extern StructRNA RNA_UIPopupMenu;
 extern StructRNA RNA_UVWarpModifier;
 extern StructRNA RNA_UVProjectModifier;

source/blender/makesrna/intern/rna_ui_api.c

@@ -268,6 +268,19 @@ static void rna_uiItemM(uiLayout *layout, bContext *C, const char *menuname, con
 	uiItemM(layout, C, menuname, name, icon);
 }
 
+static void rna_uiItemP(uiLayout *layout, bContext *C, const char *panelname, const char *name, const char *text_ctxt,
+                        int translate, int icon, int icon_value)
+{
+	/* Get translated name (label). */
+	name = rna_translate_ui_text(name, text_ctxt, NULL, NULL, translate);
+
+	if (icon_value && !icon) {
+		icon = icon_value;
+	}
+
+	uiItemP(layout, C, panelname, name, icon);
+}
+
 static void rna_uiTemplateAnyID(uiLayout *layout, PointerRNA *ptr, const char *propname, const char *proptypename,
                                 const char *name, const char *text_ctxt, int translate)
 {
@@ -670,6 +683,14 @@ void RNA_api_ui_layout(StructRNA *srna)
 	parm = RNA_def_property(func, "icon_value", PROP_INT, PROP_UNSIGNED);
 	RNA_def_property_ui_text(parm, "Icon Value", "Override automatic icon of the item");
 
+	func = RNA_def_function(srna, "popover", "rna_uiItemP");
+	RNA_def_function_flag(func, FUNC_USE_CONTEXT);
+	parm = RNA_def_string(func, "panel", NULL, 0, "", "Identifier of the panel");
+	api_ui_item_common(func);
+	RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
+	parm = RNA_def_property(func, "icon_value", PROP_INT, PROP_UNSIGNED);
+	RNA_def_property_ui_text(parm, "Icon Value", "Override automatic icon of the item");
+
 	func = RNA_def_function(srna, "separator", "uiItemS");
 	RNA_def_function_ui_description(func, "Item. Inserts empty space into the layout between items");
 

source/blender/makesrna/intern/rna_wm.c

@@ -629,6 +629,17 @@ static PointerRNA rna_PopupMenu_layout_get(PointerRNA *ptr)
 	return rptr;
 }
 
+static PointerRNA rna_PopoverMenu_layout_get(PointerRNA *ptr)
+{
+	struct uiPopoverMenu *pup = ptr->data;
+	uiLayout *layout = UI_popover_menu_layout(pup);
+
+	PointerRNA rptr;
+	RNA_pointer_create(ptr->id.data, &RNA_UILayout, layout, &rptr);
+
+	return rptr;
+}
+
 static PointerRNA rna_PieMenu_layout_get(PointerRNA *ptr)
 {
 	struct uiPieMenu *pie = ptr->data;
@@ -1978,6 +1989,11 @@ static void rna_def_popupmenu(BlenderRNA *brna)
 	rna_def_popup_menu_wrapper(brna, "UIPopupMenu", "uiPopupMenu", "rna_PopupMenu_layout_get");
 }
 
+static void rna_def_popovermenu(BlenderRNA *brna)
+{
+	rna_def_popup_menu_wrapper(brna, "UIPopoverMenu", "uiPopoverMenu", "rna_PopoverMenu_layout_get");
+}
+
 static void rna_def_piemenu(BlenderRNA *brna)
 {
 	rna_def_popup_menu_wrapper(brna, "UIPieMenu", "uiPieMenu", "rna_PieMenu_layout_get");
@@ -2415,6 +2431,7 @@ void RNA_def_wm(BlenderRNA *brna)
 	rna_def_event(brna);
 	rna_def_timer(brna);
 	rna_def_popupmenu(brna);
+	rna_def_popovermenu(brna);
 	rna_def_piemenu(brna);
 	rna_def_window(brna);
 	rna_def_windowmanager(brna);

source/blender/makesrna/intern/rna_wm_api.c

@@ -348,6 +348,24 @@ static void rna_PopMenuEnd(bContext *C, PointerRNA *handle)
 	UI_popup_menu_end(C, handle->data);
 }
 
+/* popover wrapper */
+static PointerRNA rna_PopoverBegin(bContext *C)
+{
+	PointerRNA r_ptr;
+	void *data;
+
+	data = (void *)UI_popover_menu_begin(C);
+
+	RNA_pointer_create(NULL, &RNA_UIPopupMenu, data, &r_ptr);
+
+	return r_ptr;
+}
+
+static void rna_PopoverEnd(bContext *C, PointerRNA *handle)
+{
+	UI_popover_menu_end(C, handle->data);
+}
+
 /* pie menu wrapper */
 static PointerRNA rna_PieMenuBegin(bContext *C, const char *title, int icon, PointerRNA *event)
 {
@@ -541,6 +559,22 @@ void RNA_api_wm(StructRNA *srna)
 	parm = RNA_def_pointer(func, "menu", "UIPopupMenu", "", "");
 	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
 
+
+	/* wrap UI_popover_menu_begin */
+	func = RNA_def_function(srna, "popover_begin__internal", "rna_PopoverBegin");
+	RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
+	/* return */
+	parm = RNA_def_pointer(func, "menu", "UIPopoverMenu", "", "");
+	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
+	RNA_def_function_return(func, parm);
+
+	/* wrap UI_popover_menu_end */
+	func = RNA_def_function(srna, "popover_end__internal", "rna_PopoverEnd");
+	RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
+	parm = RNA_def_pointer(func, "menu", "UIPopoverMenu", "", "");
+	RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
+
+
 	/* wrap uiPieMenuBegin */
 	func = RNA_def_function(srna, "piemenu_begin__internal", "rna_PieMenuBegin");
 	RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);