Commit: 3f7a76ef55e74dd98aa6777ce03da2111bcd7256
Author: Bastien Montagne
Date: Thu Oct 30 08:42:23 2014 +0100
Branches: experimental-build
https://developer.blender.org/rB3f7a76ef55e74dd98aa6777ce03da2111bcd7256
Revert "and back again (sticky keys testbuild)"
This reverts commit 47d894d6aaed48f761c334dd49d473a8fe2d2971.
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/editors/armature/armature_ops.c
M source/blender/editors/curve/curve_ops.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/resources.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_file/space_file.c
M source/blender/editors/space_graph/graph_ops.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm.c
M source/blender/windowmanager/WM_types.h
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/intern/wm_window.c
M source/blender/windowmanager/wm_event_system.h
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py
b/release/scripts/startup/bl_ui/space_userpref.py
index 091457e..a7ddec0 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1051,17 +1051,8 @@ class USERPREF_PT_input(Panel):
subrow.menu("USERPREF_MT_interaction_presets",
text=bpy.types.USERPREF_MT_interaction_presets.bl_label)
subrow.operator("wm.interaction_preset_add", text="", icon='ZOOMIN')
subrow.operator("wm.interaction_preset_add", text="",
icon='ZOOMOUT').remove_active = True
-
sub.separator()
- sub = col.column()
- sub.label(text="Click/Hold:")
- sub.prop(inputs, "click_timeout")
- sub.label(text="Double Click:")
- sub.prop(inputs, "double_click_time", text="Speed")
-
- sub.separator()
-
sub.label(text="Mouse:")
sub1 = sub.column()
sub1.active = (inputs.select_mouse == 'RIGHT')
@@ -1073,6 +1064,10 @@ class USERPREF_PT_input(Panel):
sub.label(text="Select With:")
sub.row().prop(inputs, "select_mouse", expand=True)
+ sub = col.column()
+ sub.label(text="Double Click:")
+ sub.prop(inputs, "mouse_double_click_time", text="Speed")
+
sub.separator()
sub.prop(inputs, "use_emulate_numpad")
diff --git a/source/blender/editors/armature/armature_ops.c
b/source/blender/editors/armature/armature_ops.c
index 90e6e05..b7e3854 100644
--- a/source/blender/editors/armature/armature_ops.c
+++ b/source/blender/editors/armature/armature_ops.c
@@ -272,7 +272,7 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "ARMATURE_OT_duplicate_move", DKEY,
KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_extrude_move", EKEY, KM_PRESS,
0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_extrude_forked", EKEY,
KM_PRESS, KM_SHIFT, 0);
- WM_keymap_add_item(keymap, "ARMATURE_OT_click_extrude", ACTIONMOUSE,
KM_RELEASE, KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "ARMATURE_OT_click_extrude", ACTIONMOUSE,
KM_CLICK, KM_CTRL, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_fill", FKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "ARMATURE_OT_merge", MKEY, KM_PRESS, KM_ALT,
0);
WM_keymap_add_item(keymap, "ARMATURE_OT_split", YKEY, KM_PRESS, 0, 0);
diff --git a/source/blender/editors/curve/curve_ops.c
b/source/blender/editors/curve/curve_ops.c
index 869de87..f1b3418 100644
--- a/source/blender/editors/curve/curve_ops.c
+++ b/source/blender/editors/curve/curve_ops.c
@@ -235,7 +235,7 @@ void ED_keymap_curve(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "CURVE_OT_handle_type_set", VKEY, KM_PRESS,
0, 0);
- WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", ACTIONMOUSE,
KM_RELEASE, KM_CTRL, 0);
+ WM_keymap_add_item(keymap, "CURVE_OT_vertex_add", ACTIONMOUSE,
KM_CLICK, KM_CTRL, 0);
kmi = WM_keymap_add_item(keymap, "CURVE_OT_select_all", AKEY, KM_PRESS,
0, 0);
RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index cb2211e..a3c52ec 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1146,7 +1146,7 @@ static int ui_handler_region_drag_toggle(bContext *C,
const wmEvent *event, void
switch (event->type) {
case LEFTMOUSE:
{
- if (event->val == KM_RELEASE) {
+ if (event->val != KM_PRESS) {
done = true;
}
break;
@@ -2605,7 +2605,7 @@ static void ui_do_but_textedit(bContext *C, uiBlock
*block, uiBut *but, uiHandle
inbox = ui_searchbox_inside(data->searchbox,
event->x, event->y);
/* for double click: we do a press again for when you
first click on button (selects all text, no cursor pos) */
- if (event->val == KM_PRESS || event->clicktype ==
KM_DBL_CLICK) {
+ if (event->val == KM_PRESS || event->val ==
KM_DBL_CLICK) {
float mx, my;
mx = event->x;
@@ -2630,7 +2630,7 @@ static void ui_do_but_textedit(bContext *C, uiBlock
*block, uiBut *but, uiHandle
}
/* only select a word in button if there was no
selection before */
- if (event->clicktype == KM_DBL_CLICK && had_selection
== false) {
+ if (event->val == KM_DBL_CLICK && had_selection ==
false) {
ui_textedit_move(but, data, STRCUR_DIR_PREV,
false, STRCUR_JUMP_DELIM);
ui_textedit_move(but, data, STRCUR_DIR_NEXT,
true, STRCUR_JUMP_DELIM);
retval = WM_UI_HANDLER_BREAK;
@@ -3028,7 +3028,7 @@ static int ui_do_but_BUT(bContext *C, uiBut *but,
uiHandleButtonData *data, cons
}
}
else if (data->state == BUTTON_STATE_WAIT_RELEASE) {
- if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
if (!(but->flag & UI_SELECT))
data->cancel = true;
button_activate_state(C, but, BUTTON_STATE_EXIT);
@@ -3564,7 +3564,7 @@ static int ui_do_but_NUM(bContext *C, uiBlock *block,
uiBut *but, uiHandleButton
button_activate_state(C, but,
BUTTON_STATE_EXIT);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
if (data->dragchange) {
#ifdef USE_DRAG_MULTINUM
/* if we started multibutton but didnt drag,
then edit */
@@ -3861,7 +3861,7 @@ static int ui_do_but_SLI(bContext *C, uiBlock *block,
uiBut *but, uiHandleButton
button_activate_state(C, but,
BUTTON_STATE_EXIT);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
if (data->dragchange) {
#ifdef USE_DRAG_MULTINUM
/* if we started multibutton but didnt drag,
then edit */
@@ -4006,7 +4006,7 @@ static int ui_do_but_SCROLL(bContext *C, uiBlock *block,
uiBut *but, uiHandleBut
button_activate_state(C, but,
BUTTON_STATE_EXIT);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else if (event->type == MOUSEMOVE) {
@@ -4054,7 +4054,7 @@ static int ui_do_but_GRIP(bContext *C, uiBlock *block,
uiBut *but, uiHandleButto
button_activate_state(C, but,
BUTTON_STATE_EXIT);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else if (event->type == MOUSEMOVE) {
@@ -4078,7 +4078,7 @@ static int ui_do_but_LISTROW(bContext *C, uiBut *but,
uiHandleButtonData *data,
* editing field for editing list item names
*/
if ((ELEM(event->type, LEFTMOUSE, PADENTER, RETKEY) &&
event->val == KM_PRESS && event->ctrl) ||
- (event->type == LEFTMOUSE && event->clicktype ==
KM_DBL_CLICK))
+ (event->type == LEFTMOUSE && event->val == KM_DBL_CLICK))
{
uiBut *labelbut = ui_but_list_row_text_activate(C, but,
data, event, BUTTON_ACTIVATE_TEXT_EDITING);
if (labelbut) {
@@ -4422,7 +4422,7 @@ static int ui_do_but_NORMAL(bContext *C, uiBlock *block,
uiBut *but, uiHandleBut
ui_numedit_apply(C, block, but, data);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -4740,7 +4740,7 @@ static int ui_do_but_HSVCUBE(bContext *C, uiBlock *block,
uiBut *but, uiHandleBu
ui_numedit_apply(C, block, but, data);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -5012,7 +5012,7 @@ static int ui_do_but_HSVCIRCLE(bContext *C, uiBlock
*block, uiBut *but, uiHandle
}
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
return WM_UI_HANDLER_BREAK;
@@ -5097,7 +5097,7 @@ static int ui_do_but_COLORBAND(bContext *C, uiBlock
*block, uiBut *but, uiHandle
ui_numedit_apply(C, block, but, data);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -5336,7 +5336,7 @@ static int ui_do_but_CURVE(bContext *C, uiBlock *block,
uiBut *but, uiHandleButt
ui_numedit_apply(C, block, but, data);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
if (data->dragsel != -1) {
CurveMapping *cumap = (CurveMapping *)but->poin;
CurveMap *cuma = cumap->cm + cumap->cur;
@@ -5432,7 +5432,7 @@ static int ui_do_but_HISTOGRAM(bContext *C, uiBlock
*block, uiBut *but, uiHandle
ui_numedit_apply(C, block, but, data);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
return WM_UI_HANDLER_BREAK;
@@ -5505,7 +5505,7 @@ static int ui_do_but_WAVEFORM(bContext *C, uiBlock
*block, uiBut *but, uiHandleB
ui_numedit_apply(C, block, but, data);
}
}
- else if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
return WM_UI_HANDLER_BREAK;
@@ -5530,7 +5530,7 @@ static int ui_do_but_LINK(bContext *C, uiBut *but,
uiHandleButtonData *data, con
}
else if (data->state == BUTTON_STATE_WAIT_RELEASE) {
- if (event->type == LEFTMOUSE && event->val == KM_RELEASE) {
+ if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
if (!(but->flag & UI_SELECT))
data->cancel = true;
button_activate_state(C, but, BUTTON_STATE_EXIT);
@@ -5613,7 +5613,7 @@ static int ui_do_but_TRACKPREVIEW(bContext *C, uiBlock
*block, uiBut *but, uiHan
ui_numedit_apply(C
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
