Merge branch 'master' into dont-always-focus-textboxes

osu.Game/Beatmaps/BeatmapManager.cs

@@ -74,15 +74,18 @@ namespace osu.Game.Beatmaps
 
         private readonly AudioManager audioManager;
 
+        private readonly GameHost host;
+
         private readonly List<DownloadBeatmapSetRequest> currentDownloads = new List<DownloadBeatmapSetRequest>();
 
-        public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, APIAccess api, AudioManager audioManager, IIpcHost importHost = null,
+        public BeatmapManager(Storage storage, IDatabaseContextFactory contextFactory, RulesetStore rulesets, APIAccess api, AudioManager audioManager, GameHost host = null,
                               WorkingBeatmap defaultBeatmap = null)
-            : base(storage, contextFactory, new BeatmapStore(contextFactory), importHost)
+            : base(storage, contextFactory, new BeatmapStore(contextFactory), host)
         {
             this.rulesets = rulesets;
             this.api = api;
             this.audioManager = audioManager;
+            this.host = host;
 
             DefaultBeatmap = defaultBeatmap;
 
@@ -254,7 +257,7 @@ namespace osu.Game.Beatmaps
             if (beatmapInfo.Metadata == null)
                 beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
 
-            WorkingBeatmap working = new BeatmapManagerWorkingBeatmap(Files.Store, beatmapInfo, audioManager);
+            WorkingBeatmap working = new BeatmapManagerWorkingBeatmap(Files.Store, new LargeTextureStore(host?.CreateTextureLoaderStore(Files.Store)), beatmapInfo, audioManager);
 
             previous?.TransferTo(working);
 

osu.Game/Beatmaps/BeatmapManager_WorkingBeatmap.cs

@@ -22,10 +22,11 @@ namespace osu.Game.Beatmaps
             private readonly IResourceStore<byte[]> store;
             private readonly AudioManager audioManager;
 
-            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, BeatmapInfo beatmapInfo, AudioManager audioManager)
+            public BeatmapManagerWorkingBeatmap(IResourceStore<byte[]> store, TextureStore textureStore, BeatmapInfo beatmapInfo, AudioManager audioManager)
                 : base(beatmapInfo)
             {
                 this.store = store;
+                this.textureStore = textureStore;
                 this.audioManager = audioManager;
             }
 
@@ -44,7 +45,7 @@ namespace osu.Game.Beatmaps
 
             private string getPathForFile(string filename) => BeatmapSetInfo.Files.First(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
 
-            private LargeTextureStore textureStore;
+            private TextureStore textureStore;
 
             protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.
 
@@ -55,7 +56,7 @@ namespace osu.Game.Beatmaps
 
                 try
                 {
-                    return (textureStore ?? (textureStore = new LargeTextureStore(new TextureLoaderStore(store)))).Get(getPathForFile(Metadata.BackgroundFile));
+                    return textureStore.Get(getPathForFile(Metadata.BackgroundFile));
                 }
                 catch
                 {

osu.Game/Input/IdleTracker.cs

@@ -27,6 +27,11 @@ namespace osu.Game.Input
 
         private readonly BindableBool isIdle = new BindableBool();
 
+        /// <summary>
+        /// Whether the game can currently enter an idle state.
+        /// </summary>
+        protected virtual bool AllowIdle => true;
+
         /// <summary>
         /// Intstantiate a new <see cref="IdleTracker"/>.
         /// </summary>
@@ -40,7 +45,7 @@ namespace osu.Game.Input
         protected override void Update()
         {
             base.Update();
-            isIdle.Value = TimeSpentIdle > timeToIdle;
+            isIdle.Value = TimeSpentIdle > timeToIdle && AllowIdle;
         }
 
         public bool OnPressed(PlatformAction action) => updateLastInteractionTime();

osu.Game/OsuGame.cs

@@ -221,9 +221,7 @@ namespace osu.Game
                     return;
                 }
 
-                var databasedSet = beatmap.OnlineBeatmapSetID != null ?
+                var databasedSet = beatmap.OnlineBeatmapSetID != null ? BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID) : BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
-                    BeatmapManager.QueryBeatmapSet(s => s.OnlineBeatmapSetID == beatmap.OnlineBeatmapSetID) :
-                    BeatmapManager.QueryBeatmapSet(s => s.Hash == beatmap.Hash);
 
                 if (databasedSet != null)
                 {
@@ -369,7 +367,7 @@ namespace osu.Game
                     RelativeSizeAxes = Axes.Both,
                 },
                 floatingOverlayContent = new Container { RelativeSizeAxes = Axes.Both, Depth = float.MinValue },
-                idleTracker = new IdleTracker(6000)
+                idleTracker = new GameIdleTracker(6000)
             });
 
             loadComponentSingleFile(screenStack = new Loader(), d =>
@@ -437,7 +435,7 @@ namespace osu.Game
                 Depth = -8,
             }, floatingOverlayContent.Add);
 
-            dependencies.Cache(idleTracker);
+            dependencies.CacheAs(idleTracker);
             dependencies.Cache(settings);
             dependencies.Cache(onscreenDisplay);
             dependencies.Cache(social);
@@ -518,6 +516,24 @@ namespace osu.Game
             notifications.StateChanged += _ => updateScreenOffset();
         }
 
+        public class GameIdleTracker : IdleTracker
+        {
+            private InputManager inputManager;
+
+            public GameIdleTracker(int time)
+                : base(time)
+            {
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                inputManager = GetContainingInputManager();
+            }
+
+            protected override bool AllowIdle => inputManager.FocusedDrawable == null;
+        }
+
         private void forwardLoggedErrorsToNotifications()
         {
             int recentLogCount = 0;

osu.Game/OsuGameBase.cs

@@ -111,8 +111,8 @@ namespace osu.Game
 
             dependencies.Cache(contextFactory = new DatabaseContextFactory(Host.Storage));
 
-            var largeStore = new LargeTextureStore(new TextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")));
+            var largeStore = new LargeTextureStore(Host.CreateTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures")));
-            largeStore.AddStore(new TextureLoaderStore(new OnlineStore()));
+            largeStore.AddStore(Host.CreateTextureLoaderStore(new OnlineStore()));
             dependencies.Cache(largeStore);
 
             dependencies.CacheAs(this);

osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs

@@ -86,7 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
 
         private class SensitivitySlider : OsuSliderBar<double>
         {
-            public override string TooltipText => Current.Disabled ? "Enable raw input to adjust sensitivity" : Current.Value.ToString(@"0.##x");
+            public override string TooltipText => Current.Disabled ? "Enable raw input to adjust sensitivity" : $"{base.TooltipText}x";
         }
     }
 }