瀏覽代碼

Fix clipping of high OutlineThickness

Now applies a margin to the textblock equal to the amount of thickness to give it space.

Fixes #27
Daniel Chalmers 2 年之前
父節點
當前提交
55c319c765
共有 1 個文件被更改,包括 7 次插入7 次删除
  1. 7 7
      DesktopClock/MainWindow.xaml

+ 7 - 7
DesktopClock/MainWindow.xaml

@@ -21,9 +21,9 @@
         MouseDoubleClick="Window_MouseDoubleClick"
         MouseDoubleClick="Window_MouseDoubleClick"
         MouseWheel="Window_MouseWheel"
         MouseWheel="Window_MouseWheel"
         SourceInitialized="Window_SourceInitialized"
         SourceInitialized="Window_SourceInitialized"
-		Deactivated="Window_Deactivated"
-		Closed="Window_Closed"
-		SizeChanged="Window_SizeChanged">
+        Deactivated="Window_Deactivated"
+        Closed="Window_Closed"
+        SizeChanged="Window_SizeChanged">
 	<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" />
@@ -116,7 +116,7 @@
 	</Window.Resources>
 	</Window.Resources>
 
 
 	<Viewbox Height="{Binding Height, Source={x:Static p:Settings.Default}, Mode=OneWay}">
 	<Viewbox Height="{Binding Height, Source={x:Static p:Settings.Default}, Mode=OneWay}">
-		<Border CornerRadius="{Binding CornerRadius, Source={x:Static p:Settings.Default}, Mode=OneWay}">
+		<Border CornerRadius="{Binding CornerRadius, 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 Property="Background">
@@ -135,10 +135,10 @@
 				</Style>
 				</Style>
 			</Border.Style>
 			</Border.Style>
 
 
-			<local:OutlinedTextBlock Margin="1,0,1,0"
-			                         HorizontalAlignment="Center"
+			<local:OutlinedTextBlock HorizontalAlignment="Center"
 			                         Text="{Binding CurrentTimeOrCountdownString}"
 			                         Text="{Binding CurrentTimeOrCountdownString}"
-			                         StrokeThickness="{Binding OutlineThickness, Source={x:Static p:Settings.Default}, Mode=OneWay}">
+			                         StrokeThickness="{Binding OutlineThickness, Source={x:Static p:Settings.Default}, Mode=OneWay}"
+			                         Margin="{Binding OutlineThickness, Source={x:Static p:Settings.Default}, Mode=OneWay}">
 
 
 				<local:OutlinedTextBlock.Fill>
 				<local:OutlinedTextBlock.Fill>
 					<SolidColorBrush Color="{Binding TextColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />
 					<SolidColorBrush Color="{Binding TextColor, Source={x:Static p:Settings.Default}, Mode=OneWay}" />