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

Bugfix #24016

Browse Source 
Removed dubious code for checking CTRL+C CTRL+V on buttons.
This made copy/paste fail if you keep the modifier key holding.
This commit is contained in:
Ton Roosendaal 2012-10-28 12:20:38 +00:00
parent 694aef1933
commit 520e1b2090
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/interface_handlers.c
View File

@ -4933,14 +4933,11 @@ static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
if (but->flag & UI_BUT_DISABLED)
return WM_UI_HANDLER_CONTINUE;
if ((data->state == BUTTON_STATE_HIGHLIGHT) &&
/* check prevval because of modal operators [#24016],
* modifier check is to allow Ctrl+C for copy.
* if this causes other problems, remove this check and suffer the bug :) - campbell */
((event->prevval != KM_PRESS) || (ISKEYMODIFIER(event->prevtype)) || (event->type == EVT_DROP)))
if ((data->state == BUTTON_STATE_HIGHLIGHT) || (event->type == EVT_DROP))
{
/* handle copy-paste */
if (ELEM(event->type, CKEY, VKEY) && event->val == KM_PRESS && (event->ctrl || event->oskey)) {
ui_but_copy_paste(C, but, data, (event->type == CKEY) ? 'c' : 'v');
return WM_UI_HANDLER_BREAK;
}