Skip to content

Commit

Permalink
fix(Studio): Force-combine inputs not being available
Browse files Browse the repository at this point in the history
  • Loading branch information
psyGamer committed Dec 14, 2024
1 parent 453c108 commit 70cb1da
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public static bool CombineInputs(bool sameActions, bool dryRun = false) {

if (!sameActions) {
// The algorithm goes backwards, but the target actions are the first valid line forwards
for (int row = minRow; row >= maxRow; row++) {
for (int row = minRow; row <= maxRow; row++) {
if (ActionLine.TryParse(Document.Lines[row], out var nextActionLine)) {
forceMergeTarget = nextActionLine;
break;
Expand Down
1 change: 0 additions & 1 deletion Studio/CelesteStudio/Editing/PopupMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ protected override void OnMouseDown(MouseEventArgs e) {
protected override void OnMouseWheel(MouseEventArgs e) {
// Update selected entry on scroll
menu.Scroll += OnScroll;
Console.WriteLine(e.Delta.Height);

if (Settings.Instance.ScrollSpeed > 0.0f) {
// Manually scroll to respect our scroll speed
Expand Down

0 comments on commit 70cb1da

Please sign in to comment.