Add blured-fit functionality to UI and core

goodtrailer · Apr 29, 2021 · 03a67af · 03a67af
1 parent 910a454
commit 03a67af
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 19 deletions.
diff --git a/DailyDesktop.Core/DailyDesktopCore.cs b/DailyDesktop.Core/DailyDesktopCore.cs
@@ -18,11 +18,14 @@ public class DailyDesktopCore
         private const string TASK_NAME_PREFIX = "Daily Desktop";
         private const string TASK_EXECUTABLE = "DailyDesktop.Task.exe";
         private const string DEFAULT_UPDATE_TIME = "12:00 AM";
+        private const int DEFAULT_BLUR_STRENGTH = 40;
 
         private readonly ProviderStore store;
         private readonly Task task;
 
         private bool enabled;
+        private bool doBlurredFit;
+        private int blurStrength;
         private IProvider currentProvider;
         private DateTime updateTime;
 
@@ -40,6 +43,26 @@ public bool Enabled
             }
         }
 
+        public bool DoBlurredFit
+        {
+            get => doBlurredFit;
+            set
+            {
+                doBlurredFit = value;
+                updateTask();
+            }
+        }
+
+        public int BlurStrength
+        {
+            get => blurStrength;
+            set
+            {
+                blurStrength = value;
+                updateTask();
+            }
+        }
+
         public IProvider CurrentProvider
         {
             get => currentProvider;
@@ -105,6 +128,17 @@ private ExecAction execAction
             }
         }
 
+        private string[] execArguments
+        {
+            get => execAction.Arguments?.Split(" ");
+            set
+            {
+                execAction.Arguments = string.Join(" ", value);
+            }
+        }
+
+        private int execArgumentsCount => execArguments?.Length ?? 0;
+
         //-----------------------------------------------------------------METHODS
 
         public DailyDesktopCore()
@@ -144,24 +178,34 @@ public DailyDesktopCore()
                 };
                 taskDefinition.Actions.Add(newExecAction);
 
+#if (!DEBUG)
+                taskDefinition.Settings.Hidden = true;
+#endif
+
                 task = TaskService.Instance.RootFolder.RegisterTaskDefinition(taskName, taskDefinition);
-                currentProvider = null;
             }
             else
             {
-                string key = execAction.Arguments;
+                string key = (execArgumentsCount < 1) ? null : execArguments[0];
 
                 if (key != null && store.Providers.ContainsKey(key))
                     store.Providers.TryGetValue(key, out currentProvider);
-                else
-                    currentProvider = null;
 
                 execAction.Path = taskExecutablePath;
                 task.RegisterChanges();
             }
 
-            updateTime = dailyTrigger.StartBoundary;
             enabled = dailyTrigger.Enabled;
+            updateTime = dailyTrigger.StartBoundary;
+
+            if (execArgumentsCount >= 2 && int.TryParse(execArguments[1], out blurStrength))
+            {
+                doBlurredFit = true;
+            } else
+            {
+                doBlurredFit = false;
+                blurStrength = DEFAULT_BLUR_STRENGTH;
+            }
         }
 
         public void UpdateWallpaper()
@@ -172,7 +216,9 @@ public void UpdateWallpaper()
         private void updateTask()
         {
             dailyTrigger.StartBoundary = updateTime;
-            execAction.Arguments = currentProvider?.Key ?? string.Empty;
+            string key = currentProvider?.Key ?? string.Empty;
+            string blur = doBlurredFit ? blurStrength.ToString() : string.Empty;
+            execArguments = new string[] { key, blur };
             dailyTrigger.Enabled = enabled;
             logonTrigger.Enabled = enabled;
             task.RegisterChanges();

diff --git a/DailyDesktop.Desktop/MainForm.Designer.cs b/DailyDesktop.Desktop/MainForm.Designer.cs
diff --git a/DailyDesktop.Desktop/MainForm.cs b/DailyDesktop.Desktop/MainForm.cs
@@ -28,6 +28,10 @@ private void MainForm_Load(object sender, EventArgs e)
 
             enabledCheckBox.Checked = core.Enabled;
             updateTimePicker.Value = core.UpdateTime;
+            updateTimePicker.Enabled = enabledCheckBox.Checked;
+            blurredFitCheckBox.Checked = core.DoBlurredFit;
+            blurStrengthTrackBar.Value = core.BlurStrength;
+            blurStrengthTrackBar.Enabled = blurredFitCheckBox.Checked;
             updateBlurStrengthToolTip();
         }
 
@@ -72,6 +76,7 @@ private void updateTimePicker_ValueChanged(object sender, EventArgs e)
         private void enabledCheckBox_CheckedChanged(object sender, EventArgs e)
         {
             core.Enabled = enabledCheckBox.Checked;
+            updateTimePicker.Enabled = enabledCheckBox.Checked;
         }
 
         private void updateWallpaperButton_Click(object sender, EventArgs e)
@@ -96,6 +101,7 @@ private void okButton_Click(object sender, EventArgs e)
 
         private void blurStrengthTrackBar_Scroll(object sender, EventArgs e)
         {
+            core.BlurStrength = blurStrengthTrackBar.Value;
             updateBlurStrengthToolTip();
         }
 
@@ -104,5 +110,11 @@ private void updateBlurStrengthToolTip()
             string strength = (blurStrengthTrackBar.Value / 100f).ToString("0.00");
             mainToolTip.SetToolTip(blurStrengthTrackBar, strength);
         }
+
+        private void blurredFitCheckBox_CheckedChanged(object sender, EventArgs e)
+        {
+            core.DoBlurredFit = blurredFitCheckBox.Checked;
+            blurStrengthTrackBar.Enabled = blurredFitCheckBox.Checked;
+        }
     }
 }
diff --git a/DailyDesktop.Desktop/MainForm.resx b/DailyDesktop.Desktop/MainForm.resx
@@ -57,6 +57,18 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="blurredFitCheckBox.ToolTip" xml:space="preserve">
+    <value>Sizes wallpaper to fit within the display's dimensions,
+but the leftover background is filled with an enlarged
+and blurred portion of the picture instead of a solid color.
+This effect  is only noticeable if the wallpaper's aspect
+ratio is different from the primary display's aspect ratio.
+
+If you want to change the official fit mode, the option
+is in the Personalization settings in Windows, the same
+as normal.
+</value>
+  </data>
   <assembly alias="System.Drawing.Common" name="System.Drawing.Common, Version=4.0.2.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
   <data name="bannerPicture.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing.Common" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

diff --git a/DailyDesktop.Task/Properties/launchSettings.json b/DailyDesktop.Task/Properties/launchSettings.json
@@ -1,7 +1,7 @@
 {
-    "profiles": {
-        "DailyDesktop.Task": {
-            "commandName": "Project"
-        }
+  "profiles": {
+    "DailyDesktop.Task": {
+      "commandName": "Project"
     }
-}
+  }
+}