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

Fixed *really* bad scrolling bug

Browse Source 
Closes #92
This commit is contained in:
Daniel Collin 2014-09-14 16:57:03 +02:00
parent ccdc7862f5
commit 179d76399f
2 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ogl_editor/src/Editor.c
View File

@ -1323,7 +1323,9 @@ static void onTrackSide(enum ArrowDirection dir, bool startOrEnd, enum Selection
if (!TrackView_isSelectedTrackVisible(viewInfo, trackData, track)) if (!TrackView_isSelectedTrackVisible(viewInfo, trackData, track))
{ {
s_editorData.trackViewInfo.startPixel += TrackView_getTracksOffset(viewInfo, trackData, oldTrack, track); int offset = TrackView_getTracksOffset(viewInfo, trackData, oldTrack, track);
s_editorData.trackViewInfo.startPixel += offset;
Editor_updateTrackScroll(); Editor_updateTrackScroll();
} }
} }

79
ogl_editor/src/TrackView.c
View File

@ -706,57 +706,46 @@ bool TrackView_isSelectedTrackVisible(TrackViewInfo* viewInfo, TrackData* trackD
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
static int getTrackOffset(TrackViewInfo* viewInfo, TrackData* trackData, int track)
{
int i = 0, j = 0;
int size = 0;
for (i = 0; i < trackData->groupCount; ++i)
{
Group* g = &trackData->groups[i];
const int trackCount = g->trackCount;
if (g->folded)
size += track_size_folded;
for (j = 0; j < trackCount; ++j)
{
Track* t = g->tracks[j];
if (!g->folded)
size += getTrackSize(viewInfo, t);
if (t->index == track)
return size;
}
}
return size;
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
int TrackView_getTracksOffset(TrackViewInfo* viewInfo, TrackData* trackData, int prevTrack, int nextTrack) int TrackView_getTracksOffset(TrackViewInfo* viewInfo, TrackData* trackData, int prevTrack, int nextTrack)
{ {
int i, j, size = 0; int prevOffset, nextOffset;
bool flip = false;
if (prevTrack == nextTrack) if (prevTrack == nextTrack)
return 0; return 0;
// handle the case when tracks are flipped prevOffset = getTrackOffset(viewInfo, trackData, prevTrack);
nextOffset = getTrackOffset(viewInfo, trackData, nextTrack);
if (prevTrack > nextTrack) return nextOffset - prevOffset;
{
int temp = nextTrack;
nextTrack = prevTrack;
prevTrack = temp;
flip = true;
}
for (i = prevTrack; i < nextTrack; )
{
Track* t = &trackData->tracks[i];
// if track has no group its always safe to assume that can select the track
if (t->group->trackCount == 1)
{
size += getTrackSize(viewInfo, t); ++i;
continue;
}
if (t->group->folded)
{
size += track_size_folded;
i += t->group->trackCount;
continue;
}
for (j = 0; j < t->group->trackCount; ++j)
{
if (i + j == nextTrack)
goto end;
size += getTrackSize(viewInfo, t->group->tracks[j]);
}
i += t->group->trackCount;
}
end:;
return flip ? -size : size;
} }