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

Now use the screen better when expanding the window size.

Browse Source 
The calculation is still a bit of but works better and is part of the "Tracks/controls should resize when window is resized" issue
This commit is contained in:
Daniel Collin 2012-10-29 21:14:25 +01:00
parent d50e469f1f
commit aeb99eb6ec
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ogl_editor/src/Editor.c
View File

@ -82,6 +82,14 @@ void Editor_create()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Editor_setWindowSize(int x, int y)
{
s_editorData.trackViewInfo.windowSizeX = x;
s_editorData.trackViewInfo.windowSizeY = y;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void Editor_init() void Editor_init()
{ {
} }
@ -301,7 +309,6 @@ bool Editor_keyDown(int key, int modifiers)
static int processCommands() static int processCommands()
{ {
//SyncDocument *doc = trackView->getDocument();
int strLen, newRow, serverIndex; int strLen, newRow, serverIndex;
unsigned char cmd = 0; unsigned char cmd = 0;
int ret = 0; int ret = 0;

1
ogl_editor/src/Editor.h
View File

@ -6,6 +6,7 @@ void Editor_init();
void Editor_update(); void Editor_update();
void Editor_timedUpdate(); void Editor_timedUpdate();
bool Editor_keyDown(int keyCode, int mod); bool Editor_keyDown(int keyCode, int mod);
void Editor_setWindowSize(int x, int y);
void Editor_menuEvent(int menuItem); void Editor_menuEvent(int menuItem);
enum enum

7
ogl_editor/src/TrackView.c
View File

@ -136,6 +136,7 @@ static inline int min(int a, int b)
} }
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
void TrackView_render(const TrackViewInfo* viewInfo, TrackData* trackData) void TrackView_render(const TrackViewInfo* viewInfo, TrackData* trackData)
{ {
@ -160,8 +161,10 @@ void TrackView_render(const TrackViewInfo* viewInfo, TrackData* trackData)
int num_tracks = syncData->num_tracks; int num_tracks = syncData->num_tracks;
if (num_tracks > 5) int max_render_tracks = viewInfo->windowSizeX / 128;
num_tracks = 5;
if (num_tracks > max_render_tracks)
num_tracks = max_render_tracks;
int start_track = 0; int start_track = 0;

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

@ -56,6 +56,7 @@
[oglContext update]; [oglContext update];
EMGFXBackend_updateViewPort((int)frameRect.size.width, (int)frameRect.size.height); EMGFXBackend_updateViewPort((int)frameRect.size.width, (int)frameRect.size.height);
Editor_setWindowSize((int)frameRect.size.width, (int)frameRect.size.height);
Editor_update(); Editor_update();
} }