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

Fixed ui rendering bug

Browse Source 
Closes #106
This commit is contained in:
Daniel Collin 2014-09-15 19:22:07 +02:00
parent a0bea881c1
commit 59363f452f
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ogl_editor/src/TrackView.c
View File

@ -58,6 +58,21 @@ struct TrackInfo
int midPos;
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
struct DrawSelectedTrack
{
int drawTrack;
int width;
int startX;
int startY;
int endY;
};
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static struct DrawSelectedTrack s_drawSelectedTrack;
extern void Dialog_showColorPicker(uint32_t* color);
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -305,8 +320,6 @@ static void drawSelectedTrackOutline(int width, int startX, int startY, int endY
{
int drawWidth = width / 4;
Emgui_setLayer(1);
// Draw top selection
Emgui_fill(track_selection_color, startX, startY, drawWidth, 2);
@ -320,8 +333,6 @@ static void drawSelectedTrackOutline(int width, int startX, int startY, int endY
Emgui_fill(track_selection_color, (startX + width) - drawWidth + 2, endY, drawWidth, 2);
Emgui_fill(track_selection_color, startX, endY - drawWidth, 2, drawWidth);
Emgui_fill(track_selection_color, startX + width, endY - drawWidth, 2, drawWidth);
Emgui_setLayer(0);
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -450,7 +461,13 @@ static int renderChannel(struct TrackInfo* info, int startX, Track* trackData, b
if (trackData->selected)
{
if (!trackData->group->folded)
drawSelectedTrackOutline(size, startX, info->startY - font_size * 4, info->endSizeY + 8);
{
s_drawSelectedTrack.drawTrack = 1;
s_drawSelectedTrack.width = size;
s_drawSelectedTrack.startX = startX;
s_drawSelectedTrack.startY = info->startY - font_size * 4;
s_drawSelectedTrack.endY = info->endSizeY + 8;
}
Emgui_fill(trackData->group->folded ? dark_active_track_color : active_track_color, startX, info->midPos, size, font_size + 1);
@ -596,6 +613,7 @@ bool TrackView_render(TrackViewInfo* viewInfo, TrackData* trackData)
int y_pos_row, end_row, y_end_border;
s_needsUpdate = false;
s_drawSelectedTrack.drawTrack = 0;
// Calc to position the selection in the ~middle of the screen
@ -662,6 +680,15 @@ bool TrackView_render(TrackViewInfo* viewInfo, TrackData* trackData)
}
}
if (s_drawSelectedTrack.drawTrack)
{
drawSelectedTrackOutline(
s_drawSelectedTrack.width,
s_drawSelectedTrack.startX,
s_drawSelectedTrack.startY,
s_drawSelectedTrack.endY);
}
Emgui_setDefaultFont();
Emgui_fill(Emgui_color32(127, 127, 127, 56), 0, mid_screen_y + adjust_top_size, viewInfo->windowSizeX, font_size + 1);