vino/rocket
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed behaviour when inserting/changing current value

Browse Source 
* if there is a value already we keep that keys type
* if there isn't a value we grab the key type from the previous key

Closes #71
This commit is contained in:
Daniel Collin 2013-01-13 23:16:10 +01:00
parent ba63529112
commit 603ad27579
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ogl_editor/src/Editor.c
View File

@ -644,10 +644,20 @@ static void endEditing()
if (track->num_keys > 0) if (track->num_keys > 0)
{ {
int idx = sync_find_key(track, getRowPos()); int idx = sync_find_key(track, getRowPos());
if (idx < 0)
idx = -idx - 1;
key.type = track->keys[emaxi(idx - 1, 0)].type; if (idx > 0)
{
// exact match, keep current type
key.type = track->keys[emaxi(idx, 0)].type;
}
else
{
// no match, grab type from previous key
if (idx < 0)
idx = -idx - 1;
key.type = track->keys[emaxi(idx - 1, 0)].type;
}
} }
track_name = track->name; track_name = track->name;
@ -1338,9 +1348,7 @@ void Editor_menuEvent(int menuItem)
case EDITOR_MENU_NEXT_KEY : case EDITOR_MENU_NEXT_KEY :
case EDITOR_MENU_PLAY : case EDITOR_MENU_PLAY :
{ {
if (is_editing) endEditing();
endEditing();
break;
} }
} }
@ -1492,7 +1500,14 @@ bool Editor_keyDown(int key, int keyCode, int modifiers)
case EMGUI_KEY_TAB : case EMGUI_KEY_TAB :
case EMGUI_KEY_ENTER : case EMGUI_KEY_ENTER :
{ {
endEditing(); if (is_editing)
{
endEditing();
if (key == EMGUI_KEY_ENTER)
return true;
}
break; break;
} }