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

Implemented jumping to top row, left/right track

Browse Source
This commit is contained in:
Daniel Collin 2012-11-03 10:09:57 +01:00
parent 32552dbd98
commit 2c580d71f5
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ogl_editor/src/Editor.c
View File

@ -191,6 +191,9 @@ bool Editor_keyDown(int key, int modifiers)
if (row < 0) if (row < 0)
row = 0; row = 0;
if (modifiers & EDITOR_KEY_COMMAND)
row = 0;
s_editorData.trackViewInfo.rowPos = row; s_editorData.trackViewInfo.rowPos = row;
RemoteConnection_sendSetRowCommand(row); RemoteConnection_sendSetRowCommand(row);
@ -204,6 +207,10 @@ bool Editor_keyDown(int key, int modifiers)
if (paused) if (paused)
{ {
int track = getActiveTrack(); track--; int track = getActiveTrack(); track--;
if (modifiers & EDITOR_KEY_COMMAND)
track = 0;
setActiveTrack(track < 0 ? 0 : track); setActiveTrack(track < 0 ? 0 : track);
handled_key = true; handled_key = true;
@ -217,9 +224,13 @@ bool Editor_keyDown(int key, int modifiers)
if (paused) if (paused)
{ {
int track = getActiveTrack(); track++; int track = getActiveTrack(); track++;
int track_count = getTrackCount();
if (track >= getTrackCount()) if (track >= track_count)
track = getTrackCount() - 1; track = track_count - 1;
if (modifiers & EDITOR_KEY_COMMAND)
track = track_count - 1;
setActiveTrack(track); setActiveTrack(track);

1
ogl_editor/src/Editor.h
View File

@ -22,5 +22,6 @@ enum
EDITOR_KEY_SHIFT = 1, EDITOR_KEY_SHIFT = 1,
EDITOR_KEY_ALT = 2, EDITOR_KEY_ALT = 2,
EDITOR_KEY_CTRL = 4, EDITOR_KEY_CTRL = 4,
EDITOR_KEY_COMMAND = 8,
}; };

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

@ -84,6 +84,9 @@
if ([theEvent modifierFlags] & NSControlKeyMask) if ([theEvent modifierFlags] & NSControlKeyMask)
specialKeys |= EDITOR_KEY_CTRL; specialKeys |= EDITOR_KEY_CTRL;
if ([theEvent modifierFlags] & NSCommandKeyMask)
specialKeys |= EDITOR_KEY_COMMAND;
if ([theEvent modifierFlags] & NSNumericPadKeyMask) if ([theEvent modifierFlags] & NSNumericPadKeyMask)
{ {
switch (keyChar) switch (keyChar)