From c852cf9b8e152cba45cddae07f621c7563b30145 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 15 Nov 2024 18:28:54 +0900 Subject: [PATCH 1/3] Remove macOS "borderless" recommendation As of SDL3, this is no longer a thing, and fullscreen should be the preferred execution mode. Probably hold off merging this until we're sure that macOS isn't broken for others in this mode (I had issues locally, such as alt-tabbing being broken sooo...) --- .../Overlays/Settings/Sections/Graphics/LayoutSettings.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs index ce087f1807..b4b5e12922 100644 --- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs @@ -269,14 +269,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics private void updateScreenModeWarning() { if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS) - { - if (windowModeDropdown.Current.Value == WindowMode.Fullscreen) - windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true); - else - windowModeDropdown.ClearNoticeText(); - return; - } if (windowModeDropdown.Current.Value != WindowMode.Fullscreen) { From b4077fc8a2afa17cccfd43f9f8d8d4b507a1f55e Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 20 Nov 2024 16:28:11 +0900 Subject: [PATCH 2/3] Use `!FrameworkEnvironment.UseSDL3` instead of removing warning altogether --- .../Settings/Sections/Graphics/LayoutSettings.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs index b4b5e12922..4362f383ee 100644 --- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs @@ -268,8 +268,16 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics private void updateScreenModeWarning() { - if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS) + // Can be removed once we stop supporting SDL2. + if (!FrameworkEnvironment.UseSDL3) + { + if (windowModeDropdown.Current.Value == WindowMode.Fullscreen) + windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true); + else + windowModeDropdown.ClearNoticeText(); + return; + } if (windowModeDropdown.Current.Value != WindowMode.Fullscreen) { From 033b7c17d556d390a55db99228705cdb16b4b0bf Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 21 Nov 2024 18:13:00 +0900 Subject: [PATCH 3/3] Add back macOS precheck --- osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs index 4362f383ee..f40a4c941f 100644 --- a/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs +++ b/osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs @@ -269,7 +269,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics private void updateScreenModeWarning() { // Can be removed once we stop supporting SDL2. - if (!FrameworkEnvironment.UseSDL3) + if (RuntimeInfo.OS == RuntimeInfo.Platform.macOS && !FrameworkEnvironment.UseSDL3) { if (windowModeDropdown.Current.Value == WindowMode.Fullscreen) windowModeDropdown.SetNoticeText(LayoutSettingsStrings.FullscreenMacOSNote, true);