浏览代码

Support multiline format and adjust height slider to help

MaxLineCount is hardcoded to 1 in OutlinedTextBlock.UpdateFormattedText() if TextWrapping is None (default).

Slider maximum was increased but people should really be making changes like that in advanced settings since they're already in there changing the format to includen ewlines.

Closes #5
Daniel Chalmers 1 年之前
父节点
当前提交
5f6ad04d37
共有 1 个文件被更改,包括 5 次插入3 次删除
  1. 5 3
      DesktopClock/MainWindow.xaml

+ 5 - 3
DesktopClock/MainWindow.xaml

@@ -22,7 +22,7 @@
         MouseDown="Window_MouseDown"
         MouseDown="Window_MouseDown"
         MouseDoubleClick="Window_MouseDoubleClick"
         MouseDoubleClick="Window_MouseDoubleClick"
         MouseWheel="Window_MouseWheel"
         MouseWheel="Window_MouseWheel"
-		ContentRendered="Window_ContentRendered"
+        ContentRendered="Window_ContentRendered"
         Closed="Window_Closed"
         Closed="Window_Closed"
         wp:WindowPlacementProperties.Placement="{Binding Placement, Source={x:Static p:Settings.Default}, Mode=TwoWay}">
         wp:WindowPlacementProperties.Placement="{Binding Placement, Source={x:Static p:Settings.Default}, Mode=TwoWay}">
 	<Window.Resources>
 	<Window.Resources>
@@ -59,7 +59,7 @@
 						<Slider Width="80"
 						<Slider Width="80"
 						        AutoToolTipPlacement="TopLeft"
 						        AutoToolTipPlacement="TopLeft"
 						        IsSnapToTickEnabled="True"
 						        IsSnapToTickEnabled="True"
-						        Maximum="160"
+						        Maximum="240"
 						        Minimum="16"
 						        Minimum="16"
 						        Value="{Binding Height, Source={x:Static p:Settings.Default}, Mode=TwoWay}" />
 						        Value="{Binding Height, Source={x:Static p:Settings.Default}, Mode=TwoWay}" />
 					</StackPanel>
 					</StackPanel>
@@ -146,7 +146,9 @@
 				</Style>
 				</Style>
 			</Border.Style>
 			</Border.Style>
 
 
-			<local:OutlinedTextBlock Text="{Binding CurrentTimeOrCountdownString}" StrokeThickness="{Binding OutlineThickness, Source={x:Static p:Settings.Default}, Mode=OneWay}">
+			<local:OutlinedTextBlock Text="{Binding CurrentTimeOrCountdownString}"
+			                         StrokeThickness="{Binding OutlineThickness, Source={x:Static p:Settings.Default}, Mode=OneWay}"
+			                         TextWrapping="Wrap">
 
 
 				<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}" />