Apply the position of the wallpaper to preview.

Grabacr07 · Aug 11, 2020 · 1dd0c11 · 1dd0c11
1 parent 3bb2a0b
commit 1dd0c11
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 9 deletions.
diff --git a/source/SylphyHorn/Application.xaml b/source/SylphyHorn/Application.xaml
@@ -23,6 +23,7 @@
 			<converters:EnumToBooleanConverter x:Key="EnumToBooleanConverter" />
 			<controls:UnlockImageConverter x:Key="UnlockImageConverter" />
 			<controls:MultiBooleanAndConverter x:Key="MultiBooleanAndConverter" />
+			<controls:WallpaperPositionConverter x:Key="WallpaperPositionConverter" />
 		</ResourceDictionary>
 	</Application.Resources>
 </Application>
diff --git a/source/SylphyHorn/Services/WallpaperService.cs b/source/SylphyHorn/Services/WallpaperService.cs
@@ -88,7 +88,7 @@ private void Set(WallpaperFile[] files)
 			if (first != null) dw.SetPosition((DesktopWallpaperPosition)first.Item2.Position);
 		}
 
-		public static Tuple<Color, string> GetCurrentColorAndWallpaper()
+		public static (Color BackgroundColor, string Path, WallpaperPosition Position) GetCurrentColorAndWallpaperAndPosition()
 		{
 			var dw = DesktopWallpaperFactory.Create();
 			var colorref = dw.GetBackgroundColor();
@@ -100,7 +100,9 @@ public static Tuple<Color, string> GetCurrentColorAndWallpaper()
 				path = dw.GetWallpaper(monitorId);
 			}
 
-			return Tuple.Create(Color.FromRgb(colorref.R, colorref.G, colorref.B), path);
+			var position = (WallpaperPosition)dw.GetPosition();
+
+			return (Color.FromRgb(colorref.R, colorref.G, colorref.B), path, position);
 		}
 	}
 

diff --git a/source/SylphyHorn/SylphyHorn.csproj b/source/SylphyHorn/SylphyHorn.csproj
@@ -257,6 +257,7 @@
     <Compile Include="UI\Controls\Keytop.cs" />
     <Compile Include="UI\Controls\MultiBooleanAndConverter.cs" />
     <Compile Include="UI\Controls\UnlockImageConverter.cs" />
+    <Compile Include="UI\Controls\WallpaperPositionConverter.cs" />
     <Compile Include="UI\DynamicInfoTrayIcon.cs" />
     <Compile Include="UI\NotificationWindow.cs" />
     <Compile Include="UI\PinWindow.xaml.cs">

diff --git a/source/SylphyHorn/UI/Bindings/SettingsWindowViewModel.cs b/source/SylphyHorn/UI/Bindings/SettingsWindowViewModel.cs
@@ -181,6 +181,26 @@ public string PreviewBackgroundPath
 
 		#endregion
 
+		#region PreviewBackgroundPosition notification property
+
+		private WallpaperPosition _PreviewBackgroundPosition = WallpaperPosition.Fill;
+
+		public WallpaperPosition PreviewBackgroundPosition
+		{
+			get => this._PreviewBackgroundPosition;
+			set
+			{
+				if (this._PreviewBackgroundPosition != value)
+				{
+					this._PreviewBackgroundPosition = value;
+
+					this.RaisePropertyChanged();
+				}
+			}
+		}
+
+		#endregion
+
 		public Brush NotificationBackground => new SolidColorBrush(WindowsTheme.ColorPrevalence.Current
 			? ImmersiveColor.GetColorByTypeName(ImmersiveColorNames.SystemAccentDark1)
 			: ImmersiveColor.GetColorByTypeName(ImmersiveColorNames.DarkChromeMedium))
@@ -243,9 +263,10 @@ public SettingsWindowViewModel(HookService hookService)
 				.Subscribe(path => this.Backgrounds = WallpaperService.Instance.GetWallpaperFiles(path))
 				.AddTo(this);
 
-			var colAndWall = WallpaperService.GetCurrentColorAndWallpaper();
-			this.PreviewBackgroundBrush = new SolidColorBrush(colAndWall.Item1);
-			this.PreviewBackgroundPath = colAndWall.Item2;
+			var colAndWall = WallpaperService.GetCurrentColorAndWallpaperAndPosition();
+			this.PreviewBackgroundBrush = new SolidColorBrush(colAndWall.BackgroundColor);
+			this.PreviewBackgroundPath = colAndWall.Path;
+			this.PreviewBackgroundPosition = colAndWall.Position;
 
 			this.Logs = ViewModelHelper.CreateReadOnlyDispatcherCollection(
 				LoggingService.Instance.Logs,

diff --git a/source/SylphyHorn/UI/Controls/WallpaperPositionConverter.cs b/source/SylphyHorn/UI/Controls/WallpaperPositionConverter.cs
@@ -0,0 +1,37 @@
+using SylphyHorn.Services;
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace SylphyHorn.UI.Controls
+{
+	public class WallpaperPositionConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			var position = (WallpaperPosition)value;
+			switch (position)
+			{
+				case WallpaperPosition.Center:
+					return Stretch.None;
+
+				case WallpaperPosition.Stretch:
+					return Stretch.Fill;
+
+				case WallpaperPosition.Fill:
+				case WallpaperPosition.Span:
+					return Stretch.UniformToFill;
+
+				case WallpaperPosition.Fit:
+				default:
+					return Stretch.Uniform;
+			}
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/source/SylphyHorn/UI/SettingsWindow.xaml b/source/SylphyHorn/UI/SettingsWindow.xaml
@@ -495,8 +495,7 @@
 									   Width="480"
 									   Height="270" />
 							<Image Source="{Binding PreviewBackgroundPath, Converter={StaticResource UnlockImageConverter}, IsAsync=True}"
-								   Stretch="Uniform"
-								   VerticalAlignment="Top"
+								   Stretch="{Binding PreviewBackgroundPosition, Converter={StaticResource WallpaperPositionConverter}, Mode=OneWay}"
 								   Width="480"
 								   Height="270" />
 
@@ -513,8 +512,7 @@
 									</ContentControl.CacheMode>
 									<Image x:Name="PreviewBlurImage"
 										   Source="{Binding PreviewBackgroundPath, Converter={StaticResource UnlockImageConverter}, IsAsync=True}"
-										   Stretch="Uniform"
-										   VerticalAlignment="Top"
+										   Stretch="{Binding PreviewBackgroundPosition, Converter={StaticResource WallpaperPositionConverter}, Mode=OneWay}"
 										   Width="480"
 										   Height="270"
 										   Visibility="{Binding HasWallpaper, Converter={StaticResource BooleanToVisibilityConverter}}"