From 0f1e28a13fe28da2eaef47a229f5bd9f192bf2bc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 5 Nov 2009 15:59:14 +0000 Subject: [PATCH] - circle select mouse wheel resize now works (somehow mouse wheel generates a mouse up event) - context.active_bone wasnt set to an editbone type --- source/blender/editors/screen/screen_context.c | 2 +- .../blender/windowmanager/intern/wm_operators.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index b0e255d60d4..919cc3f0cfd 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -231,7 +231,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult for (ebone= arm->edbo->first; ebone; ebone= ebone->next) { if (EBONE_VISIBLE(arm, ebone)) { if (ebone->flag & BONE_ACTIVE) { - CTX_data_pointer_set(result, &arm->id, &RNA_UnknownType, ebone); + CTX_data_pointer_set(result, &arm->id, &RNA_EditBone, ebone); return 1; } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 35e02d86b08..b75292ce974 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1666,7 +1666,7 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event) wmGesture *gesture= op->customdata; rcti *rect= gesture->customdata; int sx, sy; - + switch(event->type) { case MOUSEMOVE: @@ -1681,23 +1681,26 @@ int WM_gesture_circle_modal(bContext *C, wmOperator *op, wmEvent *event) gesture_circle_apply(C, op); break; - case WHEELUPMOUSE: + case WHEELDOWNMOUSE: + case PADMINUS: + case MINUSKEY: rect->xmax += 2 + rect->xmax/10; wm_gesture_tag_redraw(C); break; - case WHEELDOWNMOUSE: + case WHEELUPMOUSE: + case PADPLUSKEY: + case EQUALKEY: rect->xmax -= 2 + rect->xmax/10; if(rect->xmax < 1) rect->xmax= 1; wm_gesture_tag_redraw(C); break; case LEFTMOUSE: - case MIDDLEMOUSE: +// case MIDDLEMOUSE: /* ??? - somehow mouse wheel are interpreted as middle mouse release events - campbell */ case RIGHTMOUSE: if(event->val==KM_RELEASE) { /* key release */ wm_gesture_end(C, op); return OPERATOR_FINISHED; - } - else { + } else { if( RNA_struct_find_property(op->ptr, "event_type") ) RNA_int_set(op->ptr, "event_type", event->type);