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

Switched to alt + up/down for 8-step (as shift needs to be used for selection later on)

Browse Source
This commit is contained in:
Daniel Collin 2012-10-29 20:29:54 +01:00
parent 2dcf2a8664
commit d50e469f1f
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ogl_editor/src/Editor.c
View File

@ -152,12 +152,16 @@ bool Editor_keyDown(int key, int modifiers)
{
if (paused)
{
if (modifiers)
s_editorData.trackViewInfo.rowPos += 8;
else
s_editorData.trackViewInfo.rowPos++;
int row = row_pos;
RemoteConnection_sendSetRowCommand(s_editorData.trackViewInfo.rowPos);
if (modifiers & EDITOR_KEY_ALT)
row += 8;
else
row++;
s_editorData.trackViewInfo.rowPos = row;
RemoteConnection_sendSetRowCommand(row);
handled_key = true;
}
@ -168,15 +172,19 @@ bool Editor_keyDown(int key, int modifiers)
{
if (paused)
{
if (modifiers)
s_editorData.trackViewInfo.rowPos -= 8;
int row = row_pos;
if (modifiers & EDITOR_KEY_ALT)
row -= 8;
else
s_editorData.trackViewInfo.rowPos--;
row--;
if (s_editorData.trackViewInfo.rowPos < 0)
s_editorData.trackViewInfo.rowPos = 0;
if (row < 0)
row = 0;
RemoteConnection_sendSetRowCommand(s_editorData.trackViewInfo.rowPos);
s_editorData.trackViewInfo.rowPos = row;
RemoteConnection_sendSetRowCommand(row);
handled_key = true;
}
break;

7
ogl_editor/src/Editor.h
View File

@ -16,3 +16,10 @@ enum
EDITOR_MENU_SAVE_AS,
};
enum
{
EDITOR_KEY_SHIFT = 1,
EDITOR_KEY_ALT = 2,
EDITOR_KEY_CTRL = 4,
};

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

@ -74,7 +74,13 @@
int specialKeys = 0;
if ([theEvent modifierFlags] & NSShiftKeyMask)
specialKeys = 1;
specialKeys |= EDITOR_KEY_SHIFT;
if ([theEvent modifierFlags] & NSAlternateKeyMask)
specialKeys |= EDITOR_KEY_ALT;
if ([theEvent modifierFlags] & NSControlKeyMask)
specialKeys |= EDITOR_KEY_CTRL;
if ([theEvent modifierFlags] & NSNumericPadKeyMask)
{