From f48e15561be6a48f3249d9f30feec8aeffc1e5dc Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Wed, 1 Mar 2017 19:05:08 +1100 Subject: [PATCH] fix last commit --- ClassicalSharp/Game/InputHandler.cs | 2 +- Launcher2/LauncherWindow.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ClassicalSharp/Game/InputHandler.cs b/ClassicalSharp/Game/InputHandler.cs index 63230ff33..fe37ad191 100644 --- a/ClassicalSharp/Game/InputHandler.cs +++ b/ClassicalSharp/Game/InputHandler.cs @@ -145,7 +145,7 @@ namespace ClassicalSharp { void ScrollHotbar(float deltaPrecise) { Inventory inv = game.Inventory; if (AltDown) { - inv.Offset = ScrolledIndex(deltaPrecise, inv.Offset); + inv.Offset = ScrolledIndex(deltaPrecise, inv.Offset) * Inventory.BlocksPerRow; } else { inv.SelectedIndex = ScrolledIndex(deltaPrecise, inv.SelectedIndex); } diff --git a/Launcher2/LauncherWindow.cs b/Launcher2/LauncherWindow.cs index 696653183..c23271ed6 100644 --- a/Launcher2/LauncherWindow.cs +++ b/Launcher2/LauncherWindow.cs @@ -242,6 +242,7 @@ namespace Launcher { bool IsShutdown(Key key) { if (key == Key.F4 && (lastKey == Key.AltLeft || lastKey == Key.AltRight)) return true; + // On OSX, Cmd+Q should also terminate the process. if (!OpenTK.Configuration.RunningOnMacOS) return false; return key == Key.Q && (lastKey == Key.WinLeft || lastKey == Key.WinRight);