kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Some corrections to the pie spawning code to account for nested pies.

Browse Source
This commit is contained in:
Antony Riakiotakis 2014-10-13 19:55:19 +02:00
parent 02175027f2
commit af346f9918
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/interface/interface_regions.c
View File

@ -2729,6 +2729,13 @@ uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const
pie->block_radial->puphash = ui_popup_menu_hash(title); pie->block_radial->puphash = ui_popup_menu_hash(title);
pie->block_radial->flag |= UI_BLOCK_RADIAL; pie->block_radial->flag |= UI_BLOCK_RADIAL;
/* if pie is spawned by a left click, it is always assumed to be click style */
if (event->type == LEFTMOUSE) {
pie->block_radial->pie_data.flags |= UI_PIE_CLICK_STYLE;
pie->block_radial->pie_data.event = EVENT_NONE;
win->lock_pie_event = EVENT_NONE;
}
else {
if (win->last_pie_event != EVENT_NONE) if (win->last_pie_event != EVENT_NONE)
event_type = win->last_pie_event; event_type = win->last_pie_event;
else else
@ -2736,10 +2743,6 @@ uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const
pie->block_radial->pie_data.event = event_type; pie->block_radial->pie_data.event = event_type;
win->lock_pie_event = event_type; win->lock_pie_event = event_type;
/* if pie is spawned by a left click, it is always assumed to be click style */
if (event_type == LEFTMOUSE) {
pie->block_radial->flag |= UI_PIE_CLICK_STYLE;
} }
pie->layout = uiBlockLayout(pie->block_radial, UI_LAYOUT_VERTICAL, UI_LAYOUT_PIEMENU, 0, 0, 200, 0, 0, style); pie->layout = uiBlockLayout(pie->block_radial, UI_LAYOUT_VERTICAL, UI_LAYOUT_PIEMENU, 0, 0, 200, 0, 0, style);