From 45d07e39c18a8c4836ea06101dd76c0b7ca4fd2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 8 Jul 2017 12:41:15 +0300 Subject: [PATCH] Update framework & change logic slightly --- osu-framework | 2 +- osu.Game/Overlays/Settings/SidebarButton.cs | 4 ++-- osu.Game/Overlays/SettingsOverlay.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/osu-framework b/osu-framework index af9ffbd8b9..8dc785a0ae 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit af9ffbd8b945e526801c469dd55464363e502962 +Subproject commit 8dc785a0aecfb6df53496eff5bd9f961ff8deee6 diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs index 8d5e0e96b7..309216dd91 100644 --- a/osu.Game/Overlays/Settings/SidebarButton.cs +++ b/osu.Game/Overlays/Settings/SidebarButton.cs @@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Settings private readonly Box backgroundBox; private readonly Box selectionIndicator; private readonly Container text; - public Action Action; + public Action Action; private SettingsSection section; public SettingsSection Section @@ -112,7 +112,7 @@ namespace osu.Game.Overlays.Settings protected override bool OnClick(InputState state) { - Action?.Invoke(section, true); + Action?.Invoke(section); backgroundBox.FlashColour(Color4.White, 400); return true; } diff --git a/osu.Game/Overlays/SettingsOverlay.cs b/osu.Game/Overlays/SettingsOverlay.cs index fc9dddf121..4a5a0de890 100644 --- a/osu.Game/Overlays/SettingsOverlay.cs +++ b/osu.Game/Overlays/SettingsOverlay.cs @@ -93,7 +93,7 @@ namespace osu.Game.Overlays new SidebarButton { Section = section, - Action = sectionsContainer.ScrollContainer.ScrollTo, + Action = b => sectionsContainer.ScrollContainer.ScrollTo(b), } ).ToArray() }