Merge branch 'master' into osd-fixes

2026-05-23 02:31:18 +08:00 · 2017-05-20 00:12:10 +09:00
parent 0332348b24 14647a0e5f
commit 7e8ffe8f34
1 changed files with 6 additions and 1 deletions
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
        protected override string Header => "General";

        [BackgroundDependencyLoader]
-        private void load(FrameworkDebugConfigManager config)
+        private void load(FrameworkDebugConfigManager config, FrameworkConfigManager frameworkConfig)
        {
            Children = new Drawable[]
            {
@@ -20,6 +20,11 @@ namespace osu.Game.Overlays.Settings.Sections.Debug
                {
                    LabelText = "Bypass caching",
                    Bindable = config.GetBindable<bool>(FrameworkDebugConfig.BypassCaching)
+                },
+                new SettingsCheckbox
+                {
+                    LabelText = "Debug logs",
+                    Bindable = frameworkConfig.GetBindable<bool>(FrameworkSetting.ShowLogOverlay)
                }
            };
        }