mirror of
https://github.com/ppy/osu.git
synced 2025-03-18 02:47:19 +08:00
removed code from OsuGameBase for fullscreen.....OsuSetting still exists but cannot figure out a way to set it to a default and have it actually work
This commit is contained in:
parent
bdcb9451f7
commit
9f788f5854
osu.Game
@ -126,7 +126,7 @@ namespace osu.Game
|
||||
|
||||
private Bindable<int> configSkin;
|
||||
|
||||
private Bindable<WindowMode> windowMode;
|
||||
// private Bindable<WindowMode> windowMode;
|
||||
|
||||
private readonly string[] args;
|
||||
|
||||
@ -573,8 +573,8 @@ namespace osu.Game
|
||||
|
||||
dependencies.CacheAs(idleTracker = new GameIdleTracker(6000));
|
||||
|
||||
windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
|
||||
frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
|
||||
// windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
|
||||
// frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode).Value = windowMode.Value;
|
||||
|
||||
AddRange(new Drawable[]
|
||||
{
|
||||
|
@ -120,7 +120,6 @@ namespace osu.Game
|
||||
protected Bindable<WorkingBeatmap> Beatmap { get; private set; } // cached via load() method
|
||||
|
||||
private Bindable<bool> fpsDisplayVisible;
|
||||
private Bindable<WindowMode> windowMode;
|
||||
|
||||
public virtual Version AssemblyVersion => Assembly.GetEntryAssembly()?.GetName().Version ?? new Version();
|
||||
|
||||
@ -363,9 +362,6 @@ namespace osu.Game
|
||||
fpsDisplayVisible.ValueChanged += visible => { FrameStatistics.Value = visible.NewValue ? FrameStatisticsMode.Minimal : FrameStatisticsMode.None; };
|
||||
fpsDisplayVisible.TriggerChange();
|
||||
|
||||
windowMode = LocalConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
|
||||
windowMode.Value = WindowMode.Fullscreen;
|
||||
|
||||
FrameStatistics.ValueChanged += e => fpsDisplayVisible.Value = e.NewValue != FrameStatisticsMode.None;
|
||||
}
|
||||
|
||||
|
@ -12,6 +12,7 @@ using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Graphics.Shapes;
|
||||
using osu.Framework.Localisation;
|
||||
using osu.Framework.Logging;
|
||||
using osu.Framework.Platform;
|
||||
using osu.Game.Configuration;
|
||||
using osu.Game.Graphics.Containers;
|
||||
@ -57,7 +58,8 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
|
||||
scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
|
||||
scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
|
||||
scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
|
||||
windowMode = osuConfig.GetBindable<WindowMode>(OsuSetting.WindowSetting);
|
||||
windowMode = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode);
|
||||
Logger.Log($"windowMode {windowMode.Value}");
|
||||
|
||||
if (host.Window != null)
|
||||
{
|
||||
@ -71,7 +73,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
|
||||
{
|
||||
LabelText = "Screen mode",
|
||||
ItemSource = windowModes,
|
||||
Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode),
|
||||
Current = config.GetBindable<WindowMode>(FrameworkSetting.WindowMode)
|
||||
},
|
||||
resolutionDropdown = new ResolutionSettingsDropdown
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user