瀏覽代碼

Fix background rendering with BackgroundEnabled

#40
Daniel Chalmers 1 年之前
父節點
當前提交
463c39ebd0
共有 1 個文件被更改,包括 17 次插入12 次删除
  1. 17 12
      DesktopClock/MainWindow.xaml

+ 17 - 12
DesktopClock/MainWindow.xaml

@@ -137,28 +137,33 @@
 		<Border CornerRadius="{Binding BackgroundCornerRadius, Source={x:Static p:Settings.Default}, Mode=OneWay}" Padding="1,0,1,0">
 		<Border CornerRadius="{Binding BackgroundCornerRadius, Source={x:Static p:Settings.Default}, Mode=OneWay}" Padding="1,0,1,0">
 			<Border.Style>
 			<Border.Style>
 				<Style TargetType="Border">
 				<Style TargetType="Border">
-					<Setter Property="Background">
-						<Setter.Value>
-							<ImageBrush ImageSource="{Binding BackgroundImagePath, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
-						</Setter.Value>
-					</Setter>
+					<Setter Property="Background" Value="Transparent" />
 
 
 					<Style.Triggers>
 					<Style.Triggers>
-						<DataTrigger Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="False">
+						<DataTrigger Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="True">
 							<DataTrigger.Setters>
 							<DataTrigger.Setters>
-								<Setter Property="Background" Value="Transparent" />
+								<Setter Property="Background">
+									<Setter.Value>
+										<ImageBrush ImageSource="{Binding BackgroundImagePath, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
+									</Setter.Value>
+								</Setter>
 							</DataTrigger.Setters>
 							</DataTrigger.Setters>
 						</DataTrigger>
 						</DataTrigger>
-
-						<DataTrigger Binding="{Binding BackgroundImagePath, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="">
-							<DataTrigger.Setters>
+						
+						<MultiDataTrigger>
+							<MultiDataTrigger.Conditions>
+								<Condition Binding="{Binding BackgroundEnabled, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="True" />
+								<Condition Binding="{Binding BackgroundImagePath, Source={x:Static p:Settings.Default}, Mode=OneWay}" Value="" />
+							</MultiDataTrigger.Conditions>
+
+							<MultiDataTrigger.Setters>
 								<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}" />
 										<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.Value>
 								</Setter>
 								</Setter>
-							</DataTrigger.Setters>
-						</DataTrigger>
+							</MultiDataTrigger.Setters>
+						</MultiDataTrigger>
 					</Style.Triggers>
 					</Style.Triggers>
 				</Style>
 				</Style>
 			</Border.Style>
 			</Border.Style>