Browse Source

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 năm trước cách đây
mục cha
commit
5f6ad04d37
1 tập tin đã thay đổi với 5 bổ sung3 xóa
  1. 5 3
      DesktopClock/MainWindow.xaml

+ 5 - 3
DesktopClock/MainWindow.xaml

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