Updated to .Net 4.7.2

Added storing settings in registry Added GlassBrush for windows 10 (if enabled in system) Added Seconds Added Ability to disable AutoHide if lost focus Month and Name of the Day is now Capitalized
BaalTech · Jul 19, 2020 · eb71891 · eb71891
1 parent 9cd8aa9
commit eb71891
Show file tree

Hide file tree

Showing 8 changed files with 173 additions and 57 deletions.
diff --git a/FloatingClock/App.config b/FloatingClock/App.config
@@ -2,5 +2,5 @@
 <configuration>
   <startup>
 
-  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup>
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
 </configuration>
diff --git a/FloatingClock/FloatingClock.csproj b/FloatingClock/FloatingClock.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>FloatingClock</RootNamespace>
     <AssemblyName>FloatingClock</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>

diff --git a/FloatingClock/MainWindow.xaml b/FloatingClock/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="FloatingClock.MainWindow"
+<Window x:Name="ClockWindow" x:Class="FloatingClock.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -12,7 +12,7 @@
         Title="Charm Clock" Opacity="0.9" Background="#FF111111" Foreground="White" ResizeMode="NoResize"
         WindowStyle="None" AllowsTransparency="True" Topmost="True" ShowInTaskbar="False" Margin="0"
         SizeToContent="WidthAndHeight" Deactivated="Window_Deactivated">
-    <Grid x:Name="grid" Margin="100,0,36,0">
+    <Grid x:Name="grid" Margin="100,0">
         <Grid.RowDefinitions>
             <RowDefinition Height="40*" />
             <RowDefinition Height="60*" />
@@ -24,15 +24,24 @@
                        d:LayoutOverrides="LeftPosition, RightPosition, TopPosition, BottomPosition" FontSize="85.333"
                        Margin="0" HorizontalAlignment="Center" FontFamily="Segoe UI Light"
                        TextOptions.TextFormattingMode="Display" />
-            <TextBlock x:Name="Dots" Text=":" VerticalAlignment="Center" FontSize="85.333" Margin="0,0,0,21"
+            <TextBlock x:Name="Dots" Text=":" VerticalAlignment="Center" FontSize="85.333" Margin="0,21"
                        HorizontalAlignment="Center" TextOptions.TextFormattingMode="Display"
                        d:LayoutOverrides="LeftPosition, RightPosition, TopPosition, BottomPosition"
                        FontFamily="Segoe UI Light" />
             <TextBlock x:Name="Minutes" Text="28" VerticalAlignment="Center" FontSize="85.333" Margin="0,21"
                        HorizontalAlignment="Center" FontFamily="Segoe UI Light"
                        TextOptions.TextFormattingMode="Display"
                        d:LayoutOverrides="LeftPosition, RightPosition, TopPosition, BottomPosition" />
-            <Grid Margin="25,5,0,0" VerticalAlignment="Center" Height="66">
+            <StackPanel x:Name="OptionalSeconds" Margin="0,21" d:LayoutOverrides="LeftPosition, RightPosition" Orientation="Horizontal" Width="120">
+                <TextBlock x:Name="SecondDots" Text=":" VerticalAlignment="Center" FontSize="85.333" Margin="0"
+                    HorizontalAlignment="Center" TextOptions.TextFormattingMode="Display"
+                    FontFamily="Segoe UI Light" d:LayoutOverrides="TopPosition, BottomPosition" />
+                <TextBlock x:Name="Seconds" Text="28" VerticalAlignment="Center" FontSize="85.333" Margin="0,0,12,0"
+                    HorizontalAlignment="Center" FontFamily="Segoe UI Light"
+                    TextOptions.TextFormattingMode="Display"
+        d:LayoutOverrides="TopPosition, BottomPosition" />
+            </StackPanel>
+            <Grid Margin="25,10,0,0" VerticalAlignment="Center" Height="66">
                 <TextBlock x:Name="DayOfTheWeek" Text="środa" FontSize="32" Margin="0,-8,0,0" VerticalAlignment="Top"
                            HorizontalAlignment="Left" d:LayoutOverrides="HorizontalAlignment"
                            FontFamily="Segoe WP SemiLight" FontStretch="Expanded" />