Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: re-enable precise chart editor scrolling, and also fix smooth scroll playhead/playbar playback #3806

Merged
merged 1 commit into from
Oct 30, 2024
+4 −2
Merged

fix: re-enable precise chart editor scrolling, and also fix smooth scroll playhead/playbar playback #3806

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions source/funkin/ui/debug/charting/ChartEditorState.hx
View file
Open in desktop
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
Loading