From cabcfffdeb2960df5cb1fc4b0fee19e26253350b Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Wed, 23 Jan 2019 01:16:37 +0100 Subject: [PATCH 1/4] Fix autoplay rewind/skip usable when UI hidden --- osu.Game/Screens/Play/HUDOverlay.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs index dac05c23b1..8d50b58c3b 100644 --- a/osu.Game/Screens/Play/HUDOverlay.cs +++ b/osu.Game/Screens/Play/HUDOverlay.cs @@ -102,6 +102,7 @@ namespace osu.Game.Screens.Play { showHud = config.GetBindable(OsuSetting.ShowInterface); showHud.ValueChanged += hudVisibility => visibilityContainer.FadeTo(hudVisibility ? 1 : 0, duration); + showHud.ValueChanged += v => Progress.AllowSeeking = v; showHud.TriggerChange(); if (!showHud && !hasShownNotificationOnce) From f01ba17d1f3ee0f73666a63ce315d3fe1cd78646 Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Wed, 23 Jan 2019 02:12:40 +0100 Subject: [PATCH 2/4] add check if replay is loaded before allowseeking can be overwitten --- osu.Game/Screens/Play/SongProgress.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs index 336f9cc430..a892b9afd6 100644 --- a/osu.Game/Screens/Play/SongProgress.cs +++ b/osu.Game/Screens/Play/SongProgress.cs @@ -125,7 +125,7 @@ namespace osu.Game.Screens.Play set { if (allowSeeking == value) return; - + if (!replayLoaded) return; allowSeeking = value; updateBarVisibility(); } From 12503b4d074b1243a4fb986a0db87918c1106571 Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Wed, 23 Jan 2019 02:37:17 +0100 Subject: [PATCH 3/4] revert and make VisibilityContainer not AlwaysPresent --- osu.Game/Screens/Play/HUDOverlay.cs | 2 -- osu.Game/Screens/Play/SongProgress.cs | 1 - 2 files changed, 3 deletions(-) diff --git a/osu.Game/Screens/Play/HUDOverlay.cs b/osu.Game/Screens/Play/HUDOverlay.cs index 8d50b58c3b..cbd36d75c6 100644 --- a/osu.Game/Screens/Play/HUDOverlay.cs +++ b/osu.Game/Screens/Play/HUDOverlay.cs @@ -48,7 +48,6 @@ namespace osu.Game.Screens.Play { visibilityContainer = new Container { RelativeSizeAxes = Axes.Both, - AlwaysPresent = true, // The hud may be hidden but certain elements may need to still be updated Children = new Drawable[] { new Container { Anchor = Anchor.TopCentre, @@ -102,7 +101,6 @@ namespace osu.Game.Screens.Play { showHud = config.GetBindable(OsuSetting.ShowInterface); showHud.ValueChanged += hudVisibility => visibilityContainer.FadeTo(hudVisibility ? 1 : 0, duration); - showHud.ValueChanged += v => Progress.AllowSeeking = v; showHud.TriggerChange(); if (!showHud && !hasShownNotificationOnce) diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs index a892b9afd6..328f54423d 100644 --- a/osu.Game/Screens/Play/SongProgress.cs +++ b/osu.Game/Screens/Play/SongProgress.cs @@ -125,7 +125,6 @@ namespace osu.Game.Screens.Play set { if (allowSeeking == value) return; - if (!replayLoaded) return; allowSeeking = value; updateBarVisibility(); } From 13ba9d64d09a8fa2a8aa28bce02691368c23a655 Mon Sep 17 00:00:00 2001 From: chrisny286 Date: Wed, 23 Jan 2019 02:56:00 +0100 Subject: [PATCH 4/4] revert empty line --- osu.Game/Screens/Play/SongProgress.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs index 328f54423d..336f9cc430 100644 --- a/osu.Game/Screens/Play/SongProgress.cs +++ b/osu.Game/Screens/Play/SongProgress.cs @@ -125,6 +125,7 @@ namespace osu.Game.Screens.Play set { if (allowSeeking == value) return; + allowSeeking = value; updateBarVisibility(); }