[Bf-blender-cvs] [664dc55] pie-menus: Remove force click argument, now pies detect click style automatically
Antony Riakiotakis
noreply at git.blender.org
Thu Jul 31 18:38:20 CEST 2014
Commit: 664dc55305157f3162b89a8a74837e4e84fecbf9
Author: Antony Riakiotakis
Date: Thu Jul 31 18:00:15 2014 +0200
Branches: pie-menus
https://developer.blender.org/rB664dc55305157f3162b89a8a74837e4e84fecbf9
Remove force click argument, now pies detect click style automatically
===================================================================
M release/scripts/modules/bpy_types.py
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_regions.c
M source/blender/makesrna/intern/rna_wm_api.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index 60ee6ce..bc2e936 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -140,9 +140,9 @@ class WindowManager(bpy_types.ID):
finally:
self.pupmenu_end__internal(popup)
- def popup_menu_pie(self, event, draw_func, title="", icon='NONE', force_hold=False):
+ def popup_menu_pie(self, event, draw_func, title="", icon='NONE'):
import bpy
- pie = self.piemenu_begin__internal(title, icon, event, force_hold)
+ pie = self.piemenu_begin__internal(title, icon, event)
try:
draw_func(pie, bpy.context)
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 7032c05..32b34ae 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -364,12 +364,12 @@ bool uiPupMenuInvoke(struct bContext *C, const char *idname, struct ReportList *
/* Pie menus */
typedef struct uiPieMenu uiPieMenu;
-void uiPieMenuInvoke(struct bContext *C, const char *idname, const struct wmEvent *event, bool force_click);
+void uiPieMenuInvoke(struct bContext *C, const char *idname, const struct wmEvent *event);
void uiPieOperatorEnumInvoke(struct bContext *C, const char *title, const char *opname,
- const char *propname, const struct wmEvent *event, bool force_click);
-void uiPieEnumInvoke(struct bContext *C, const char *title, const char *path, const struct wmEvent *event, bool force_click);
+ const char *propname, const struct wmEvent *event);
+void uiPieEnumInvoke(struct bContext *C, const char *title, const char *path, const struct wmEvent *event);
-uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const struct wmEvent *event, bool force_hold) ATTR_NONNULL();
+uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const struct wmEvent *event) ATTR_NONNULL();
void uiPieMenuEnd(struct bContext *C, uiPieMenu *pie);
struct uiLayout *uiPieMenuLayout(struct uiPieMenu *pie);
/* Popup Blocks
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index fe0644b..ae14fb3 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -2676,7 +2676,7 @@ static float uiPieTitleWidth(const char *name, int icon)
(UI_UNIT_X * (1.50f + (icon ? 0.25f : 0.0f)));
}
-struct uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const wmEvent *event, bool UNUSED(force_click))
+struct uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon, const wmEvent *event)
{
uiStyle *style = UI_GetStyleDraw();
uiPieMenu *pie = MEM_callocN(sizeof(uiPopupMenu), "pie menu");
@@ -2688,10 +2688,6 @@ struct uiPieMenu *uiPieMenuBegin(struct bContext *C, const char *title, int icon
pie->block_radial->puphash = ui_popup_menu_hash(title);
pie->block_radial->flag |= UI_BLOCK_RADIAL;
pie->block_radial->pie_data.event = event->type;
- /*
- * if (force_click)
- * pie->block_radial->pie_data.flags |= UI_PIE_CLICK_STYLE;
- */
pie->layout = uiBlockLayout(pie->block_radial, UI_LAYOUT_VERTICAL, UI_LAYOUT_PIEMENU, 0, 0, 200, 0, 0, style);
pie->mx = event->x;
@@ -2736,7 +2732,7 @@ uiLayout *uiPieMenuLayout(uiPieMenu *pie)
return pie->layout;
}
-void uiPieMenuInvoke(struct bContext *C, const char *idname, const wmEvent *event, bool force_click)
+void uiPieMenuInvoke(struct bContext *C, const char *idname, const wmEvent *event)
{
uiPieMenu *pie;
uiLayout *layout;
@@ -2751,7 +2747,7 @@ void uiPieMenuInvoke(struct bContext *C, const char *idname, const wmEvent *even
if (mt->poll && mt->poll(C, mt) == 0)
return;
- pie = uiPieMenuBegin(C, IFACE_(mt->label), ICON_NONE, event, force_click);
+ pie = uiPieMenuBegin(C, IFACE_(mt->label), ICON_NONE, event);
layout = uiPieMenuLayout(pie);
menu.layout = layout;
@@ -2768,12 +2764,12 @@ void uiPieMenuInvoke(struct bContext *C, const char *idname, const wmEvent *even
void uiPieOperatorEnumInvoke(struct bContext *C, const char *title, const char *opname,
- const char *propname, const wmEvent *event, bool force_click)
+ const char *propname, const wmEvent *event)
{
uiPieMenu *pie;
uiLayout *layout;
- pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event, force_click);
+ pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event);
layout = uiPieMenuLayout(pie);
layout = uiLayoutRadial(layout);
@@ -2783,7 +2779,7 @@ void uiPieOperatorEnumInvoke(struct bContext *C, const char *title, const char *
}
void uiPieEnumInvoke(struct bContext *C, const char *title, const char *path,
- const wmEvent *event, bool force_click)
+ const wmEvent *event)
{
PointerRNA ctx_ptr;
PointerRNA r_ptr;
@@ -2801,7 +2797,7 @@ void uiPieEnumInvoke(struct bContext *C, const char *title, const char *path,
if (RNA_property_type(r_prop) != PROP_ENUM)
return;
- pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event, force_click);
+ pie = uiPieMenuBegin(C, IFACE_(title), ICON_NONE, event);
layout = uiPieMenuLayout(pie);
layout = uiLayoutRadial(layout);
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index fbd4e9f..7d49952 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -311,12 +311,12 @@ static void rna_PupMenuEnd(bContext *C, PointerRNA *handle)
}
/* pie menu wrapper */
-static PointerRNA rna_PieMenuBegin(bContext *C, const char *title, int icon, PointerRNA *event, int force_hold)
+static PointerRNA rna_PieMenuBegin(bContext *C, const char *title, int icon, PointerRNA *event)
{
PointerRNA r_ptr;
void *data;
- data = (void *)uiPieMenuBegin(C, title, icon, event->data, force_hold);
+ data = (void *)uiPieMenuBegin(C, title, icon, event->data);
RNA_pointer_create(NULL, &RNA_UIPieMenu, data, &r_ptr);
@@ -489,8 +489,6 @@ void RNA_api_wm(StructRNA *srna)
RNA_def_property_enum_items(parm, icon_items);
parm = RNA_def_pointer(func, "event", "Event", "", "");
RNA_def_property_flag(parm, PROP_RNAPTR | PROP_NEVER_NULL);
- parm = RNA_def_property(func, "force_hold", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_default(parm, 0);
/* return */
parm = RNA_def_pointer(func, "menu_pie", "UIPieMenu", "", "");
RNA_def_property_flag(parm, PROP_RNAPTR | PROP_NEVER_NULL);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 7b78b80..a832721 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2054,7 +2054,7 @@ static int wm_call_pie_menu_invoke(bContext *C, wmOperator *op, const wmEvent *e
char idname[BKE_ST_MAXNAME];
RNA_string_get(op->ptr, "name", idname);
- uiPieMenuInvoke(C, idname, event, RNA_boolean_get(op->ptr, "force_click"));
+ uiPieMenuInvoke(C, idname, event);
return OPERATOR_CANCELLED;
}
@@ -2064,7 +2064,7 @@ static int wm_call_pie_menu_exec(bContext *C, wmOperator *op)
char idname[BKE_ST_MAXNAME];
RNA_string_get(op->ptr, "name", idname);
- uiPieMenuInvoke(C, idname, CTX_wm_window(C)->eventstate, RNA_boolean_get(op->ptr, "force_click"));
+ uiPieMenuInvoke(C, idname, CTX_wm_window(C)->eventstate);
return OPERATOR_CANCELLED;
}
@@ -2082,7 +2082,6 @@ static void WM_OT_call_menu_pie(wmOperatorType *ot)
ot->flag = OPTYPE_INTERNAL;
RNA_def_string(ot->srna, "name", NULL, BKE_ST_MAXNAME, "Name", "Name of the pie menu");
- RNA_def_boolean(ot->srna, "force_click", false, "Force Click Style", "Pie menu overrides interaction user preference with click interaction");
}
typedef struct PieTimerData {
@@ -2132,7 +2131,7 @@ static int wm_sticky_pie_menu_modal(bContext *C, wmOperator *op, const wmEvent *
RNA_string_get(op->ptr, "property_name", prop_name);
RNA_string_get(op->ptr, "name", pie_name);
- uiPieOperatorEnumInvoke(C, pie_name, op_name, prop_name, &data->event, false);
+ uiPieOperatorEnumInvoke(C, pie_name, op_name, prop_name, &data->event);
break;
}
@@ -2141,7 +2140,7 @@ static int wm_sticky_pie_menu_modal(bContext *C, wmOperator *op, const wmEvent *
char idname[BKE_ST_MAXNAME];
RNA_string_get(op->ptr, "name", idname);
- uiPieMenuInvoke(C, idname, &data->event, false);
+ uiPieMenuInvoke(C, idname, &data->event);
break;
}
@@ -2158,7 +2157,7 @@ static int wm_sticky_pie_menu_modal(bContext *C, wmOperator *op, const wmEvent *
if (str[0] == '\0')
break;
- uiPieEnumInvoke(C, pie_name, str, &data->event, false);
+ uiPieEnumInvoke(C, pie_name, str, &data->event);
MEM_freeN(str);
break;
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index fea1211..87a8bbf 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -413,7 +413,7 @@ void ED_view3D_background_image_remove(struct View3D *v3d, struct BGpic *bgpic)
void ED_view3D_background_image_clear(struct View3D *v3d) RET_NONE
void ED_view3d_update_viewmat(struct Scene *scene, struct View3D *v3d, struct ARegion *ar, float viewmat[4][4], float winmat[4][4]) RET_NONE
float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char **grid_unit) RET_ZERO
-void ED_view3d_shade_update(struct Main *bmain, struct View3D *v3d, struct ScrArea *sa) RET_NONE
+void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct View3D *v3d, struct ScrArea *sa) RET_NONE
void ED_node_shader_default(const struct bContext *C, struct ID *id) RET_NONE
void ED_screen_animation_timer_update(struct bScreen *screen, int redraws, int refresh) RET_NONE
struct bScreen *ED_screen_animation_playing(const struct wmWindowManager *wm) RET_NULL
@@ -623,12 +623,12 @@ struct uiPopupMenu *uiPupMenu
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list