Restoring FL* Designer Settings

Updating WinForms Demo 2 Former-commit-id: cb30345
SuRGeoNix · Mar 15, 2021 · aef3cb5 · aef3cb5
1 parent 4b92b23
commit aef3cb5
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 51 deletions.
diff --git a/Flyleaf Multi-Player (WinForms Demo 2)/FrmMain.Designer.cs b/Flyleaf Multi-Player (WinForms Demo 2)/FrmMain.Designer.cs
diff --git a/Flyleaf Player (WinForms Demo 1)/FrmMain.Designer.cs b/Flyleaf Player (WinForms Demo 1)/FrmMain.Designer.cs
diff --git a/Flyleaf.sln b/Flyleaf.sln
@@ -60,6 +60,7 @@ Global
 		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Debug|x64.ActiveCfg = Debug|x64
 		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Debug|x86.ActiveCfg = Debug|x86
+		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Debug|x86.Build.0 = Debug|x86
 		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Release|x64.ActiveCfg = Release|x64
 		{B43D7121-74DD-42FB-9DBE-A3459A4DCB63}.Release|x64.Build.0 = Release|x64

diff --git a/Flyleaf/Controls/FlyleafPlayer.cs b/Flyleaf/Controls/FlyleafPlayer.cs
@@ -158,8 +158,15 @@ public void Initialize()
                 player  = new MediaRouter(0);
             #endif
 
-            config                   = new Settings(player);
-            config.PropertyChanged   = SettingsChanged;
+            if (!DesignerSettings)
+            {
+                config                   = new Settings(player);
+                config.PropertyChanged   = SettingsChanged;
+            }
+            else
+                player.renderer.IsFullScreen = true;
+
+            player.renderer.OSDEnabled = OSDEnabled;
 
             try
             {
@@ -1011,7 +1018,7 @@ public void NormalScreen    (bool fromOpen = false)
                 Focus();
             }
 
-            player.renderer.IsFullScreen = false;
+            if (!DesignerSettings) player.renderer.IsFullScreen = false;
 
             form.Location   = formLastPos;
             form.Size       = formLastSize;
@@ -2009,6 +2016,14 @@ private void WM_MOUSEMOVE_MK_LBUTTON(MouseEventArgs e)
         [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)]
         public Settings         config              { get; set; }
 
+        [Category("Flyleaf UI")]
+        [DisplayName("_DESIGNER_CONF_ENABLED")]
+        public  bool DesignerSettings               { get; set; } = true;
+
+        [Category("Flyleaf UI")]
+        [DisplayName("_OSD_ENABLED")]
+        public  bool OSDEnabled                     { get; set; } = true;
+
         [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Content)]
         [DisplayName("FL Main")]
         public Settings.Main    _main               { get { return config.main;     } set { config.main     = value; } }