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

WIP on move keys

Browse Source 
Some work on #99
This commit is contained in:
Daniel Collin 2014-09-19 13:45:00 +02:00
parent 9e9d6b6d56
commit 88b2312d6f
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ogl_editor/src/Editor.c
View File

@ -1155,6 +1155,21 @@ static void onPaste()
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static void onMoveSelection(bool down)
{
const int row_pos = getRowPos();
onCutAndCopy(true);
if (down)
setRowPos(row_pos + 1);
else
setRowPos(row_pos - 1);
onPaste();
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static void onSelectTrack()
{
int activeTrack = getActiveTrack();
@ -1689,6 +1704,8 @@ void Editor_menuEvent(int menuItem)
case EDITOR_MENU_CUT : onCutAndCopy(true); break;
case EDITOR_MENU_COPY : onCutAndCopy(false); break;
case EDITOR_MENU_PASTE : onPaste(); break;
case EDITOR_MENU_MOVE_UP : onMoveSelection(true); break;
case EDITOR_MENU_MOVE_DOWN : onMoveSelection(false); break;
case EDITOR_MENU_SELECT_TRACK : onSelectTrack(); break;
case EDITOR_MENU_BIAS_P_001 : biasSelection(0.01f); break;

2
ogl_editor/src/Menu.c
View File

@ -26,6 +26,8 @@ MenuDescriptor g_editMenu[] =
{ _T("Cut"), EDITOR_MENU_CUT, 'x', EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },
{ _T("Copy"), EDITOR_MENU_COPY, 'c', EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },
{ _T("Paste"), EDITOR_MENU_PASTE, 'v', EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },
{ _T("Move selection up"), EDITOR_MENU_MOVE_UP, 'x', 0 , 0 },
{ _T("Move selection down"), EDITOR_MENU_MOVE_DOWN, 'c', 0 , 0 },
{ _T(""), EDITOR_MENU_SEPARATOR, 0, 0, 0 },
{ _T("Select Track"), EDITOR_MENU_SELECT_TRACK, 't', EMGUI_KEY_COMMAND, EMGUI_KEY_CTRL },
{ _T(""), EDITOR_MENU_SEPARATOR, 0, 0, 0 },

2
ogl_editor/src/Menu.h
View File

@ -36,6 +36,8 @@ enum
EDITOR_MENU_CUT,
EDITOR_MENU_COPY,
EDITOR_MENU_PASTE,
EDITOR_MENU_MOVE_UP,
EDITOR_MENU_MOVE_DOWN,
EDITOR_MENU_SELECT_TRACK,
EDITOR_MENU_BIAS_P_001,
EDITOR_MENU_BIAS_P_01,

2
ogl_editor/src/windows/RocketWindow.c
View File

@ -517,6 +517,8 @@ LRESULT CALLBACK WndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam
case EDITOR_MENU_CUT:
case EDITOR_MENU_COPY:
case EDITOR_MENU_PASTE:
case EDITOR_MENU_MOVE_UP:
case EDITOR_MENU_MOVE_DOWN:
case EDITOR_MENU_SELECT_TRACK:
case EDITOR_MENU_BIAS_P_001:
case EDITOR_MENU_BIAS_P_01: