h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 23:43:03 +08:00
Code Issues Releases Wiki Activity

Merge pull request #23089 from Susko3/fix-window-mode-dropdown

Browse Source 
Fix window mode dropdown not showing
This commit is contained in:
Bartłomiej Dach 2023-04-02 20:24:32 +02:00 committed by GitHub
commit bc0538a7f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -32,7 +32,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
private FillFlowContainer<SettingsSlider<float>> scalingSettings = null!; private FillFlowContainer<SettingsSlider<float>> scalingSettings = null!;
private readonly Bindable<Display> currentDisplay = new Bindable<Display>(); private readonly Bindable<Display> currentDisplay = new Bindable<Display>();
private readonly IBindableList<WindowMode> windowModes = new BindableList<WindowMode>();
private Bindable<ScalingMode> scalingMode = null!; private Bindable<ScalingMode> scalingMode = null!;
private Bindable<Size> sizeFullscreen = null!; private Bindable<Size> sizeFullscreen = null!;
@ -87,6 +86,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{ {
LabelText = GraphicsSettingsStrings.ScreenMode, LabelText = GraphicsSettingsStrings.ScreenMode,
Items = window?.SupportedWindowModes, Items = window?.SupportedWindowModes,
CanBeShown = { Value = window?.SupportedWindowModes.Count() > 1 },
Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode), Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
}, },
displayDropdown = new DisplaySettingsDropdown displayDropdown = new DisplaySettingsDropdown
@ -180,8 +180,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
updateScreenModeWarning(); updateScreenModeWarning();
}, true); }, true);
windowModes.BindCollectionChanged((_, _) => updateDisplaySettingsVisibility());
currentDisplay.BindValueChanged(display => Schedule(() => currentDisplay.BindValueChanged(display => Schedule(() =>
{ {
resolutions.RemoveRange(1, resolutions.Count - 1); resolutions.RemoveRange(1, resolutions.Count - 1);
@ -235,7 +233,6 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
private void updateDisplaySettingsVisibility() private void updateDisplaySettingsVisibility()
{ {
windowModeDropdown.CanBeShown.Value = windowModes.Count > 1;
resolutionDropdown.CanBeShown.Value = resolutions.Count > 1 && windowModeDropdown.Current.Value == WindowMode.Fullscreen; resolutionDropdown.CanBeShown.Value = resolutions.Count > 1 && windowModeDropdown.Current.Value == WindowMode.Fullscreen;
displayDropdown.CanBeShown.Value = displayDropdown.Items.Count() > 1; displayDropdown.CanBeShown.Value = displayDropdown.Items.Count() > 1;
safeAreaConsiderationsCheckbox.CanBeShown.Value = host.Window?.SafeAreaPadding.Value.Total != Vector2.Zero; safeAreaConsiderationsCheckbox.CanBeShown.Value = host.Window?.SafeAreaPadding.Value.Total != Vector2.Zero;