Merge pull request #118 from tillvit/development

Development
tillvit · Jul 31, 2024 · 0992079 · 0992079
2 parents ea4a6f3 + 4f05454
commit 0992079
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/src/data/GameplayKeybindData.ts b/app/src/data/GameplayKeybindData.ts
@@ -222,7 +222,7 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
     },
     {
       label: "UpRight",
-      keys: ["R"],
+      keys: ["E"],
     },
     {
       label: "DownRight",
@@ -244,7 +244,7 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
     },
     {
       label: "P1 UpRight",
-      keys: ["R"],
+      keys: ["E"],
     },
     {
       label: "P1 DownRight",
@@ -286,7 +286,7 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
     },
     {
       label: "P1 UpRight",
-      keys: ["R"],
+      keys: ["E"],
     },
     {
       label: "P1 DownRight",
@@ -328,7 +328,7 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
     },
     {
       label: "P1 UpRight",
-      keys: ["R"],
+      keys: ["E"],
     },
     {
       label: "P1 DownRight",
@@ -362,7 +362,7 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
     },
     {
       label: "P1 UpRight",
-      keys: ["R"],
+      keys: ["E"],
     },
     {
       label: "P1 DownRight",

diff --git a/app/src/gui/window/NoteskinWindow.ts b/app/src/gui/window/NoteskinWindow.ts
@@ -95,7 +95,10 @@ export class NoteskinWindow extends Window {
       if (id == Options.chart.noteskin.name) {
         container.classList.add("selected")
         setTimeout(() => {
-          container.scrollIntoView({ behavior: "smooth", block: "center" })
+          container.scrollIntoView({
+            behavior: Options.general.smoothAnimations ? "smooth" : "instant",
+            block: "center",
+          })
         })
       }