瀏覽代碼

Add background image advanced option

Closes #36
Daniel Chalmers 1 年之前
父節點
當前提交
27ef7002e3
共有 2 個文件被更改,包括 15 次插入4 次删除
  1. 14 4
      DesktopClock/MainWindow.xaml
  2. 1 0
      DesktopClock/Properties/Settings.cs

+ 14 - 4
DesktopClock/MainWindow.xaml

@@ -20,10 +20,10 @@
         MouseDown="Window_MouseDown"
         MouseDown="Window_MouseDown"
         MouseDoubleClick="Window_MouseDoubleClick"
         MouseDoubleClick="Window_MouseDoubleClick"
         MouseWheel="Window_MouseWheel"
         MouseWheel="Window_MouseWheel"
-		SourceInitialized="Window_SourceInitialized"
+        SourceInitialized="Window_SourceInitialized"
         ContentRendered="Window_ContentRendered"
         ContentRendered="Window_ContentRendered"
-		Closing="Window_Closing"
-		StateChanged="Window_StateChanged">
+        Closing="Window_Closing"
+        StateChanged="Window_StateChanged">
 	<Window.Resources>
 	<Window.Resources>
 		<ContextMenu x:Key="MainContextMenu" x:Shared="False">
 		<ContextMenu x:Key="MainContextMenu" x:Shared="False">
 			<MenuItem Command="{Binding CopyToClipboardCommand}" Header="_Copy" />
 			<MenuItem Command="{Binding CopyToClipboardCommand}" Header="_Copy" />
@@ -139,7 +139,7 @@
 				<Style TargetType="Border">
 				<Style TargetType="Border">
 					<Setter Property="Background">
 					<Setter Property="Background">
 						<Setter.Value>
 						<Setter.Value>
-							<SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}" Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+							<ImageBrush ImageSource="{Binding BackgroundImagePath, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
 						</Setter.Value>
 						</Setter.Value>
 					</Setter>
 					</Setter>
 
 
@@ -149,6 +149,16 @@
 								<Setter Property="Background" Value="Transparent" />
 								<Setter Property="Background" Value="Transparent" />
 							</DataTrigger.Setters>
 							</DataTrigger.Setters>
 						</DataTrigger>
 						</DataTrigger>
+
+						<DataTrigger Binding="{Binding BackgroundImagePath, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="">
+							<DataTrigger.Setters>
+								<Setter Property="Background">
+									<Setter.Value>
+										<SolidColorBrush Opacity="{Binding BackgroundOpacity, Source={x:Static p:Settings.Default}, Mode=OneWay}" Color="{Binding OuterColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+									</Setter.Value>
+								</Setter>
+							</DataTrigger.Setters>
+						</DataTrigger>
 					</Style.Triggers>
 					</Style.Triggers>
 				</Style>
 				</Style>
 			</Border.Style>
 			</Border.Style>

+ 1 - 0
DesktopClock/Properties/Settings.cs

@@ -69,6 +69,7 @@ public sealed class Settings : INotifyPropertyChanged, IDisposable
     public bool BackgroundEnabled { get; set; } = true;
     public bool BackgroundEnabled { get; set; } = true;
     public double BackgroundOpacity { get; set; } = 0.90;
     public double BackgroundOpacity { get; set; } = 0.90;
     public double BackgroundCornerRadius { get; set; } = 1;
     public double BackgroundCornerRadius { get; set; } = 1;
+    public string BackgroundImagePath { get; set; } = string.Empty;
     public double OutlineThickness { get; set; } = 0.2;
     public double OutlineThickness { get; set; } = 0.2;
     public bool Topmost { get; set; } = true;
     public bool Topmost { get; set; } = true;
     public bool ShowInTaskbar { get; set; } = true;
     public bool ShowInTaskbar { get; set; } = true;