From 04f7acb68a2607fea989e030a891783c48d90efe Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:46:51 +0900 Subject: [PATCH 1/3] Add setting checkbox to toggle debug logs --- .../Overlays/Settings/Sections/Debug/GeneralSettings.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs index 9fbb4011b7..c0ee478b37 100644 --- a/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Debug/GeneralSettings.cs @@ -12,7 +12,7 @@ public class GeneralSettings : SettingsSubsection 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 @@ private void load(FrameworkDebugConfigManager config) { LabelText = "Bypass caching", Bindable = config.GetBindable(FrameworkDebugConfig.BypassCaching) + }, + new SettingsCheckbox + { + LabelText = "Debug logs", + Bindable = frameworkConfig.GetBindable(FrameworkSetting.ShowLogOverlay) } }; } From 5bcef91b8912a66cceb06354c1d055a1074d9d78 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:49:47 +0900 Subject: [PATCH 2/3] Add padding to setting value on on screen display Long audio device names were destroying all padding. --- osu.Game/Overlays/OnScreenDisplay.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index fb1aed3657..4034d19c80 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -76,6 +76,7 @@ public OnScreenDisplay() { TextSize = 24, Font = @"Exo2.0-Light", + Padding = new MarginPadding { Left = 10, Right = 10 }, Anchor = Anchor.Centre, Origin = Anchor.BottomCentre, }, From 0332348b2484d60a3a7ea8218139994730dbbb77 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 19 May 2017 22:51:09 +0900 Subject: [PATCH 3/3] Correctly display default audio device on OSD --- osu.Game/Overlays/OnScreenDisplay.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/OnScreenDisplay.cs b/osu.Game/Overlays/OnScreenDisplay.cs index 4034d19c80..d262826fd2 100644 --- a/osu.Game/Overlays/OnScreenDisplay.cs +++ b/osu.Game/Overlays/OnScreenDisplay.cs @@ -117,7 +117,7 @@ public OnScreenDisplay() private void load(FrameworkConfigManager frameworkConfig) { trackSetting(frameworkConfig.GetBindable(FrameworkSetting.FrameSync), v => display(v, "Frame Limiter", v.GetDescription(), "Ctrl+F7")); - trackSetting(frameworkConfig.GetBindable(FrameworkSetting.AudioDevice), v => display(v, "Audio Device", v, v)); + trackSetting(frameworkConfig.GetBindable(FrameworkSetting.AudioDevice), v => display(v, "Audio Device", string.IsNullOrEmpty(v) ? "Default" : v, v)); trackSetting(frameworkConfig.GetBindable(FrameworkSetting.ShowLogOverlay), v => display(v, "Debug Logs", v ? "visible" : "hidden", "Ctrl+F10")); Action displayResolution = delegate { display(null, "Screen Resolution", frameworkConfig.Get(FrameworkSetting.Width) + "x" + frameworkConfig.Get(FrameworkSetting.Height)); };