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

Merge branch 'master' of https://github.com/emoon/rocket

Browse Source 
Conflicts:
	ogl_editor/src/Editor.h
	test.rocket
This commit is contained in:
Daniel Collin 2012-10-24 00:07:23 +02:00
commit 7f4a5df823
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ogl_editor/src/Editor.c
View File

@ -219,14 +219,17 @@ void Editor_update()
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Editor_keyDown(int key)
bool Editor_keyDown(int key)
{
bool handled_key = true;
//printf("callBack %d\n", key);
switch (key)
{
case EMGUI_ARROW_DOWN : start_pos++; break;
case EMGUI_ARROW_UP : start_pos--; break;
default : handled_key = false; break;
}
if (start_pos < -19)
@ -241,7 +244,11 @@ void Editor_keyDown(int key)
if (offset > s_testChannel.maxRange)
s_testChannel.maxRange = offset;
return true;
}
return handled_key;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

6
ogl_editor/src/macosx/RocketView.m
View File

@ -70,10 +70,10 @@
}
}
Editor_keyDown(keyCode);
Editor_update();
if (!Editor_keyDown(keyCode))
[super keyDown:theEvent];
//[super keyDown:theEvent];
Editor_update();
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////