Skip to content

Commit

Permalink
fix: re-enable precise chart editor scrolling, and also fix smooth sc…
Browse files Browse the repository at this point in the history
…roll playhead/playbar playback (#3806)
  • Loading branch information
ninjamuffin99 authored Oct 30, 2024
1 parent 6321983 commit 0d8e4a5
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions source/funkin/ui/debug/charting/ChartEditorState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -2729,6 +2729,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
{
// Update the conductor and audio tracks to match.
currentScrollEase = d.value;
easeSongToScrollPosition(currentScrollEase);
}
}

Expand All @@ -2741,7 +2742,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
playbarHeadDraggingWasPlaying = false;

// Disabled code to resume song playback on drag.
// startAudioPlayback();
startAudioPlayback();
}
}

Expand Down Expand Up @@ -3873,7 +3874,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
}

// Mouse Wheel = Scroll
if (FlxG.mouse.wheel != 0 && !FlxG.keys.pressed.CONTROL)
if (FlxG.mouse.wheel != 0)
{
scrollAmount = -50 * FlxG.mouse.wheel;
shouldPause = true;
Expand Down Expand Up @@ -4469,6 +4470,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState
0, songLengthInPixels);

currentScrollEase = clickedPosInPixels;
easeSongToScrollPosition(currentScrollEase);
}
else if (scrollAnchorScreenPos != null)
{
Expand Down

0 comments on commit 0d8e4a5

Please sign in to comment.