[Bf-blender-cvs] [0ae03b6] pie-menus: minor edits - sync with master

Campbell Barton noreply at git.blender.org
Thu Jul 31 15:14:42 CEST 2014


Commit: 0ae03b6fa174ad479fc4e711b82b894d8350ad6c
Author: Campbell Barton
Date:   Thu Jul 31 22:01:41 2014 +1000
Branches: pie-menus
https://developer.blender.org/rB0ae03b6fa174ad479fc4e711b82b894d8350ad6c

minor edits - sync with master

also use ***_menu_pie for operator names

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

M	source/blender/editors/space_api/spacetypes.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/windowmanager/intern/wm_event_system.c
M	source/blender/windowmanager/intern/wm_keymap.c
M	source/blender/windowmanager/intern/wm_operators.c
M	source/blender/windowmanager/wm_event_system.h

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

diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index 89a94ca..ea11506 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -130,7 +130,7 @@ void ED_spacetypes_init(void)
 		if (type->operatortypes)
 			type->operatortypes();
 	}
-	
+
 	/* register internal render callbacks */
 	ED_render_internal_init();
 }
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index ee2a723..755af78 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3549,11 +3549,11 @@ void VIEW3D_OT_zoom_camera_1_to_1(wmOperatorType *ot)
 /* ********************* Changing view operator ****************** */
 
 static EnumPropertyItem prop_view_items[] = {
-    {RV3D_VIEW_LEFT, "LEFT", ICON_TRIA_LEFT, "Left", "View From the Left"},
+	{RV3D_VIEW_LEFT, "LEFT", ICON_TRIA_LEFT, "Left", "View From the Left"},
 	{RV3D_VIEW_RIGHT, "RIGHT", ICON_TRIA_RIGHT, "Right", "View From the Right"},
-    {RV3D_VIEW_BOTTOM, "BOTTOM", ICON_TRIA_DOWN, "Bottom", "View From the Bottom"},
-    {RV3D_VIEW_TOP, "TOP", ICON_TRIA_UP, "Top", "View From the Top"},
-    {RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"},
+	{RV3D_VIEW_BOTTOM, "BOTTOM", ICON_TRIA_DOWN, "Bottom", "View From the Bottom"},
+	{RV3D_VIEW_TOP, "TOP", ICON_TRIA_UP, "Top", "View From the Top"},
+	{RV3D_VIEW_FRONT, "FRONT", 0, "Front", "View From the Front"},
 	{RV3D_VIEW_BACK, "BACK", 0, "Back", "View From the Back"},
 	{RV3D_VIEW_CAMERA, "CAMERA", ICON_CAMERA_DATA, "Camera", "View From the Active Camera"},
 	{0, NULL, 0, NULL, NULL}
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 1df8249..46a897a 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -400,8 +400,12 @@ static int wm_handler_ui_call(bContext *C, wmEventHandler *handler, wmEvent *eve
 	
 	/* UI code doesn't handle return values - it just always returns break. 
 	 * to make the DBL_CLICK conversion work, we just don't send this to UI, except mouse clicks */
-	if (!(handler->flag & WM_HANDLER_ACCEPT_DBL_CLICK) && event->type != LEFTMOUSE && event->val == KM_DBL_CLICK)
+	if (((handler->flag & WM_HANDLER_ACCEPT_DBL_CLICK) == 0) &&
+	    (event->type != LEFTMOUSE) &&
+	    (event->val == KM_DBL_CLICK))
+	{
 		return WM_HANDLER_CONTINUE;
+	}
 	
 	/* UI is quite aggressive with swallowing events, like scrollwheel */
 	/* I realize this is not extremely nice code... when UI gets keymaps it can be maybe smarter */
@@ -2559,7 +2563,8 @@ void WM_event_remove_keymap_handler(ListBase *handlers, wmKeyMap *keymap)
 	}
 }
 
-wmEventHandler *WM_event_add_ui_handler(const bContext *C, ListBase *handlers,
+wmEventHandler *WM_event_add_ui_handler(
+        const bContext *C, ListBase *handlers,
         wmUIHandlerFunc ui_handle, wmUIHandlerRemoveFunc ui_remove,
         void *userdata, const bool accept_dbl_click)
 {
@@ -3454,7 +3459,7 @@ PointerRNA *WM_operator_pie_macro(const char *idname, const char *name, const ch
                                   description, flag);
 
 	if (ot) {
-		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_pie_menu");
+		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_menu_pie");
 		RNA_string_set(otmacro->ptr, "name", piename);
 		otmacro = WM_operatortype_macro_define(ot, opname);
 		return otmacro->ptr;
@@ -3473,7 +3478,7 @@ struct PointerRNA *WM_operator_property_pie_macro(const char *idname, const char
                                   description, flag);
 
 	if (ot) {
-		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_pie_menu");
+		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_menu_pie");
 		RNA_string_set(otmacro->ptr, "name", piename);
 		RNA_string_set(otmacro->ptr, "operator_name", opname);
 		RNA_string_set(otmacro->ptr, "property_name", propname);
@@ -3496,7 +3501,7 @@ struct PointerRNA *WM_operator_enum_pie_macro(const char *idname, const char *na
                                   description, flag);
 
 	if (ot) {
-		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_pie_menu");
+		otmacro = WM_operatortype_macro_define(ot, "WM_OT_sticky_menu_pie");
 		RNA_string_set(otmacro->ptr, "name", piename);
 		RNA_string_set(otmacro->ptr, "data_path", path);
 		RNA_enum_set(otmacro->ptr, "mode", STICKY_PIE_PATH);
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c
index 568b63f..ad5e349 100644
--- a/source/blender/windowmanager/intern/wm_keymap.c
+++ b/source/blender/windowmanager/intern/wm_keymap.c
@@ -466,7 +466,7 @@ wmKeyMapItem *WM_keymap_add_menu(wmKeyMap *keymap, const char *idname, int type,
 
 wmKeyMapItem *WM_keymap_add_pie_menu(wmKeyMap *keymap, const char *idname, int type, int val, int modifier, int keymodifier, bool force_click)
 {
-	wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_pie_menu", type, val, modifier, keymodifier);
+	wmKeyMapItem *kmi = WM_keymap_add_item(keymap, "WM_OT_call_menu_pie", type, val, modifier, keymodifier);
 	RNA_string_set(kmi->ptr, "name", idname);
 	RNA_boolean_set(kmi->ptr, "force_click", force_click);
 	return kmi;
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index fdf3fdd..7b78b80 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2069,10 +2069,10 @@ static int wm_call_pie_menu_exec(bContext *C, wmOperator *op)
 	return OPERATOR_CANCELLED;
 }
 
-static void WM_OT_call_pie_menu(wmOperatorType *ot)
+static void WM_OT_call_menu_pie(wmOperatorType *ot)
 {
 	ot->name = "Call Pie Menu";
-	ot->idname = "WM_OT_call_pie_menu";
+	ot->idname = "WM_OT_call_menu_pie";
 	ot->description = "Call (draw) a pre-defined pie menu";
 
 	ot->invoke = wm_call_pie_menu_invoke;
@@ -2178,7 +2178,7 @@ static int wm_sticky_pie_menu_modal(bContext *C, wmOperator *op, const wmEvent *
 	return OPERATOR_RUNNING_MODAL;
 }
 
-static void WM_OT_sticky_pie_menu(wmOperatorType *ot)
+static void WM_OT_sticky_menu_pie(wmOperatorType *ot)
 {
 	PropertyRNA *prop;
 
@@ -2190,7 +2190,7 @@ static void WM_OT_sticky_pie_menu(wmOperatorType *ot)
 	};
 
 	ot->name = "Sticky Pie Menu";
-	ot->idname = "WM_OT_sticky_pie_menu";
+	ot->idname = "WM_OT_sticky_menu_pie";
 	ot->description = "Call (draw) a pre-defined pie menu or cancel";
 
 	ot->invoke = wm_sticky_pie_menu_invoke;
@@ -4602,8 +4602,8 @@ void wm_operatortype_init(void)
 	WM_operatortype_append(WM_OT_splash);
 	WM_operatortype_append(WM_OT_search_menu);
 	WM_operatortype_append(WM_OT_call_menu);
-	WM_operatortype_append(WM_OT_call_pie_menu);
-	WM_operatortype_append(WM_OT_sticky_pie_menu);
+	WM_operatortype_append(WM_OT_call_menu_pie);
+	WM_operatortype_append(WM_OT_sticky_menu_pie);
 	WM_operatortype_append(WM_OT_radial_control);
 #if defined(WIN32)
 	WM_operatortype_append(WM_OT_console_toggle);
diff --git a/source/blender/windowmanager/wm_event_system.h b/source/blender/windowmanager/wm_event_system.h
index 0d57351..d1a9419 100644
--- a/source/blender/windowmanager/wm_event_system.h
+++ b/source/blender/windowmanager/wm_event_system.h
@@ -81,9 +81,9 @@ enum {
 
 /* handler flag */
 enum {
-	WM_HANDLER_BLOCKING         = 1,  /* after this handler all others are ignored */
-	WM_HANDLER_DO_FREE          = 2,  /* handler tagged to be freed in wm_handlers_do() */
-	WM_HANDLER_ACCEPT_DBL_CLICK = 4,  /* handler accepts double key press events */
+	WM_HANDLER_BLOCKING             = (1 << 0),  /* after this handler all others are ignored */
+	WM_HANDLER_DO_FREE              = (1 << 1),  /* handler tagged to be freed in wm_handlers_do() */
+	WM_HANDLER_ACCEPT_DBL_CLICK     = (1 << 2),  /* handler accepts double key press events */
 };
 
 /* wm_event_system.c */




More information about the Bf-blender-cvs mailing list