beta 1.2.1.5

- fixed a bug where customise wallpaper in control panel did not work when selected screen is not primary and wallpaper arrangement is span. - changed tostring() to originalstring for url dragdrop. - made in-app customise wallpaper menu default to selected screen for per wallpaper arrangement. - updated some commandline control helptext.
rocksdanister · Apr 7, 2021 · 64b95ae · 64b95ae
1 parent 22e4e2c
commit 64b95ae
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 23 deletions.
diff --git a/src/livelywpf/livelyCmdUtility/Program.cs b/src/livelywpf/livelyCmdUtility/Program.cs
@@ -63,7 +63,7 @@ class SeekWallpaperOptions
         {
             [Option("value",
             Required = true,
-            HelpText = "Seek percentage from current position.")]
+            HelpText = "Seek percentage, optionally add +/- to seek from current position.")]
             public string Param { get; set; }
 
             [Option("monitor",

diff --git a/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs b/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs
@@ -40,7 +40,7 @@ public LivelyPropertiesView(LibraryModel model)
             wallpaperData = model;
             try
             {
-                var wpInfo = GetLivelyPropertyDetails(model, Program.SettingsVM.Settings.WallpaperArrangement);
+                var wpInfo = GetLivelyPropertyDetails(model, Program.SettingsVM.Settings.WallpaperArrangement, Program.SettingsVM.Settings.SelectedDisplay);
                 this.livelyPropertyCopyPath = wpInfo.Item1;
                 this.screen = wpInfo.Item2;
             }
@@ -619,7 +619,7 @@ public static bool RestoreOriginalPropertyFile(LibraryModel wallpaperData, strin
         /// </summary>
         /// <param name="obj">LibraryModel object</param>
         /// <returns></returns>
-        public static Tuple<string, LivelyScreen> GetLivelyPropertyDetails(LibraryModel obj, WallpaperArrangement arrangement)
+        public static Tuple<string, LivelyScreen> GetLivelyPropertyDetails(LibraryModel obj, WallpaperArrangement arrangement, LivelyScreen selectedScreen)
         {
             if (obj.LivelyPropertyPath == null)
             {
@@ -633,8 +633,7 @@ public static Tuple<string, LivelyScreen> GetLivelyPropertyDetails(LibraryModel
             {
                 try
                 {
-                    //wallpaper not running, give the path for primaryscreen.
-                    screen = ScreenHelper.GetPrimaryScreen();
+                    screen = selectedScreen;
                     var dataFolder = Path.Combine(Program.WallpaperDir, "SaveData", "wpdata");
                     if (screen.DeviceNumber != null)
                     {
@@ -685,7 +684,7 @@ public static Tuple<string, LivelyScreen> GetLivelyPropertyDetails(LibraryModel
                     case WallpaperArrangement.per:
                         {
                             //more than one screen; if selected display, sendpath otherwise send the first one found.
-                            int index = items.FindIndex(x => ScreenHelper.ScreenCompare(Program.SettingsVM.Settings.SelectedDisplay, x.GetScreen(), DisplayIdentificationMode.deviceId));
+                            int index = items.FindIndex(x => ScreenHelper.ScreenCompare(selectedScreen, x.GetScreen(), DisplayIdentificationMode.deviceId));
                             livelyPropertyCopy = index != -1 ? items[index].GetLivelyPropertyCopyPath() : items[0].GetLivelyPropertyCopyPath();
                             screen = index != -1 ? items[index].GetScreen() : items[0].GetScreen();
                         }

diff --git a/src/livelywpf/livelywpf/Cmd/CommandHandler.cs b/src/livelywpf/livelywpf/Cmd/CommandHandler.cs
@@ -65,7 +65,7 @@ class SeekWallpaperOptions
         {
             [Option("value",
             Required = true,
-            HelpText = "Seek percentage from current position.")]
+            HelpText = "Seek percentage, optionally add +/- to seek from current position.")]
             public string Param { get; set; }
 
             [Option("monitor",

diff --git a/src/livelywpf/livelywpf/ViewModel/ScreenLayoutViewModel.cs b/src/livelywpf/livelywpf/ViewModel/ScreenLayoutViewModel.cs
@@ -156,20 +156,12 @@ public RelayCommand CustomiseWallpaperCommand
 
         private void CustomiseWallpaper(ScreenLayoutModel selection)
         {
-            if (SelectedItem != null)
+            //only for running wallpapers..
+            var items = SetupDesktop.Wallpapers.FindAll(x => x.GetWallpaperData().LivelyPropertyPath != null);
+            if (items.Count > 0)
             {
-                foreach (var x in SetupDesktop.Wallpapers)
-                {
-                    if (ScreenHelper.ScreenCompare(x.GetScreen(), selection.Screen, DisplayIdentificationMode.deviceId))
-                    {
-                        if (selection.LivelyPropertyPath != null)
-                        {
-                            var settingsWidget = new Cef.LivelyPropertiesTrayWidget(x.GetWallpaperData());
-                            settingsWidget.Show();
-                        }
-                        break;
-                    }
-                }
+                var settingsWidget = new Cef.LivelyPropertiesTrayWidget(items[0].GetWallpaperData());
+                settingsWidget.Show();
             }
         }
 

diff --git a/src/livelywpf/livelywpf/Views/Main/LibraryView.xaml.cs b/src/livelywpf/livelywpf/Views/Main/LibraryView.xaml.cs
@@ -186,14 +186,14 @@ await this.Dispatcher.InvokeAsync(new Action(async () => {
                     if (Program.SettingsVM.Settings.AutoDetectOnlineStreams &&
                         StreamHelper.IsSupportedStream(uri))
                     {
-                        Program.LibraryVM.AddWallpaper(uri.ToString(),
+                        Program.LibraryVM.AddWallpaper(uri.OriginalString,
                             WallpaperType.videostream,
                             LibraryTileType.processing,
                             Program.SettingsVM.Settings.SelectedDisplay);
                     }
                     else
                     {
-                        Program.LibraryVM.AddWallpaper(uri.ToString(),
+                        Program.LibraryVM.AddWallpaper(uri.OriginalString,
                             WallpaperType.url,
                             LibraryTileType.processing,
                             Program.SettingsVM.Settings.SelectedDisplay);

diff --git a/src/livelywpf/livelywpf/livelywpf.csproj b/src/livelywpf/livelywpf/livelywpf.csproj
@@ -10,7 +10,7 @@
     <StartupObject>livelywpf.Program</StartupObject>
     <ApplicationIcon>appicon.ico</ApplicationIcon>
     <Version>1.0.0</Version>
-    <AssemblyVersion>1.3.0.0</AssemblyVersion>
+    <AssemblyVersion>1.2.1.5</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">