diff --git a/README.md b/README.md index 246f2c99..fdadbd54 100644 --- a/README.md +++ b/README.md @@ -109,12 +109,12 @@ Just drag & drop files, webpages to set as wallpaper.. **_I'm not officially affiliated with Unity technologies, godot, shadertoy;_** ## Download -##### Latest version: v1.6.0.2 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.6.0.2) +##### Latest version: v1.6.0.4 (Windows 10 1903 or above)[What's new?](https://github.com/rocksdanister/lively/releases/tag/v1.6.0.4) - [`Installer`][direct-full-win32] -SHA256: 112f8c2587d97e57096705336ace649fe3e12e0f25b010bcc3f625a072fb9420 +SHA256: 706f9e7176e1db242b79583aeeedcd3bad199e7d05da29775a678891601c0238 -[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.6.0.2/lively_setup_x86_full_v1602.exe +[direct-full-win32]: https://github.com/rocksdanister/lively/releases/download/v1.6.0.4/lively_setup_x86_full_v1604.exe Installer will give Smartscreen warning, [discussion.](https://github.com/rocksdanister/lively/issues/9) diff --git a/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs b/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs index a049d0e3..4c645119 100644 --- a/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs +++ b/src/livelywpf/livelywpf/Cef/LivelyProperties/Page/LivelyPropertiesView.xaml.cs @@ -320,8 +320,7 @@ private void Slider_ValueChanged(object sender, Windows.UI.Xaml.Controls.Primiti try { var item = (Windows.UI.Xaml.Controls.Slider)sender; - - WallpaperSendMsg("lively:customise slider " + item.Name + " " + JsonConvert.SerializeObject(item.Value)); + WallpaperSendMsg("lively:customise slider " + item.Name + " " + ((item.StepFrequency % 1) != 0 ? JsonConvert.SerializeObject(item.Value) : JsonConvert.SerializeObject(Convert.ToInt32(item.Value)))); livelyPropertyCopyData[item.Name]["value"] = item.Value; UpdatePropertyFile(); } diff --git a/src/livelywpf/livelywpf/Core/Wallpapers/VideoMpvPlayer.cs b/src/livelywpf/livelywpf/Core/Wallpapers/VideoMpvPlayer.cs index aef3fa90..706e4798 100644 --- a/src/livelywpf/livelywpf/Core/Wallpapers/VideoMpvPlayer.cs +++ b/src/livelywpf/livelywpf/Core/Wallpapers/VideoMpvPlayer.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Globalization; using System.IO; using System.Text; using System.Threading; @@ -331,7 +332,7 @@ private string GetLivelyProperty(string uiElement, string objectName, string msg string result = null; if (uiElement.Equals("dropdown", StringComparison.OrdinalIgnoreCase)) { - if (int.TryParse(msg, out int value)) + if (int.TryParse(msg, NumberStyles.Any, CultureInfo.InvariantCulture, out int value)) { //value string in items array is passed instead of index like in cef livelyproperties. result = GetMpvJsonPropertyString("command", "set_property", objectName, (string)livelyPropertiesData[objectName]["items"][value]); @@ -339,7 +340,7 @@ private string GetLivelyProperty(string uiElement, string objectName, string msg } else if (uiElement.Equals("slider", StringComparison.OrdinalIgnoreCase)) { - if (double.TryParse(msg, out double value)) + if (double.TryParse(msg, NumberStyles.Any, CultureInfo.InvariantCulture, out double value)) { result = GetMpvJsonPropertyString("command", "set_property", objectName, msg); } diff --git a/src/livelywpf/livelywpf/livelywpf.csproj b/src/livelywpf/livelywpf/livelywpf.csproj index 897f63f1..62d579f4 100644 --- a/src/livelywpf/livelywpf/livelywpf.csproj +++ b/src/livelywpf/livelywpf/livelywpf.csproj @@ -10,7 +10,7 @@ livelywpf.Program appicon.ico 1.0.0 - 1.6.0.2 + 1.6.0.4