Merge branch 'master' into editor-setup-file-selector-popovers

osu.Game/Beatmaps/BeatmapManager.cs

@@ -128,6 +128,7 @@ namespace osu.Game.Beatmaps
                         BaseDifficulty = new BeatmapDifficulty(),
                         Ruleset = ruleset,
                         Metadata = metadata,
+                        WidescreenStoryboard = true,
                     }
                 }
             };

osu.Game/Beatmaps/Formats/LegacyBeatmapEncoder.cs

@@ -93,8 +93,8 @@ namespace osu.Game.Beatmaps.Formats
             //     writer.WriteLine(@"OverlayPosition: " + b.OverlayPosition);
             // if (!string.IsNullOrEmpty(b.SkinPreference))
             //     writer.WriteLine(@"SkinPreference:" + b.SkinPreference);
-            // if (b.EpilepsyWarning)
+            if (beatmap.BeatmapInfo.EpilepsyWarning)
-            //     writer.WriteLine(@"EpilepsyWarning: 1");
+                writer.WriteLine(@"EpilepsyWarning: 1");
             // if (b.CountdownOffset > 0)
             //     writer.WriteLine(@"CountdownOffset: " + b.CountdownOffset.ToString());
             if (beatmap.BeatmapInfo.RulesetID == 3)

osu.Game/Screens/Edit/Setup/DesignSection.cs

@@ -0,0 +1,60 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Allocation;
+using osu.Framework.Localisation;
+using osu.Game.Graphics.UserInterfaceV2;
+
+namespace osu.Game.Screens.Edit.Setup
+{
+    internal class DesignSection : SetupSection
+    {
+        private LabelledSwitchButton widescreenSupport;
+        private LabelledSwitchButton epilepsyWarning;
+        private LabelledSwitchButton letterboxDuringBreaks;
+
+        public override LocalisableString Title => "Design";
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            Children = new[]
+            {
+                widescreenSupport = new LabelledSwitchButton
+                {
+                    Label = "Widescreen support",
+                    Description = "Allows storyboards to use the full screen space, rather than be confined to a 4:3 area.",
+                    Current = { Value = Beatmap.BeatmapInfo.WidescreenStoryboard }
+                },
+                epilepsyWarning = new LabelledSwitchButton
+                {
+                    Label = "Epilepsy warning",
+                    Description = "Recommended if the storyboard or video contain scenes with rapidly flashing colours.",
+                    Current = { Value = Beatmap.BeatmapInfo.EpilepsyWarning }
+                },
+                letterboxDuringBreaks = new LabelledSwitchButton
+                {
+                    Label = "Letterbox during breaks",
+                    Description = "Adds horizontal letterboxing to give a cinematic look during breaks.",
+                    Current = { Value = Beatmap.BeatmapInfo.LetterboxInBreaks }
+                }
+            };
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            widescreenSupport.Current.BindValueChanged(_ => updateBeatmap());
+            epilepsyWarning.Current.BindValueChanged(_ => updateBeatmap());
+            letterboxDuringBreaks.Current.BindValueChanged(_ => updateBeatmap());
+        }
+
+        private void updateBeatmap()
+        {
+            Beatmap.BeatmapInfo.WidescreenStoryboard = widescreenSupport.Current.Value;
+            Beatmap.BeatmapInfo.EpilepsyWarning = epilepsyWarning.Current.Value;
+            Beatmap.BeatmapInfo.LetterboxInBreaks = letterboxDuringBreaks.Current.Value;
+        }
+    }
+}

osu.Game/Screens/Edit/Setup/SetupScreen.cs

@@ -34,7 +34,8 @@ namespace osu.Game.Screens.Edit.Setup
                         new ResourcesSection(),
                         new MetadataSection(),
                         new DifficultySection(),
-                        new ColoursSection()
+                        new ColoursSection(),
+                        new DesignSection(),
                     }
                 },
             });