Bladeren bron

Format XAML

Daniel Chalmers 7 jaren geleden
bovenliggende
commit
00b4752d1e
2 gewijzigde bestanden met toevoegingen van 22 en 24 verwijderingen
  1. 3 5
      Clock Widget/App.xaml
  2. 19 19
      Clock Widget/MainWindow.xaml

+ 3 - 5
Clock Widget/App.xaml

@@ -1,10 +1,8 @@
 <Application x:Class="Clock_Widget.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:Clock_Widget"
-             StartupUri="MainWindow.xaml"
+             Exit="Application_Exit"
              Startup="Application_Startup"
-             Exit="Application_Exit">
-    <Application.Resources>
-    </Application.Resources>
+             StartupUri="MainWindow.xaml">
+    <Application.Resources />
 </Application>

+ 19 - 19
Clock Widget/MainWindow.xaml

@@ -1,25 +1,25 @@
 <Window x:Class="Clock_Widget.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"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Clock_Widget"
         xmlns:p="clr-namespace:Clock_Widget.Properties"
         xmlns:wp="clr-namespace:WpfWindowPlacement;assembly=WpfWindowPlacement"
         mc:Ignorable="d"
         Title="{x:Static local:App.Title}"
-        Topmost="{Binding Topmost, Source={x:Static p:Settings.Default}, Mode=TwoWay}"
-        ShowInTaskbar="{Binding ShowInTaskbar, Source={x:Static p:Settings.Default}, Mode=TwoWay}"
-        SizeToContent="WidthAndHeight"
-        ResizeMode="NoResize"
-        WindowStyle="None"
         AllowsTransparency="True"
         Background="Transparent"
-        UseLayoutRounding="True"
         FontFamily="Consolas"
+        MouseDown="Window_MouseDown"
+        ResizeMode="NoResize"
+        ShowInTaskbar="{Binding ShowInTaskbar, Source={x:Static p:Settings.Default}, Mode=TwoWay}"
+        SizeToContent="WidthAndHeight"
+        Topmost="{Binding Topmost, Source={x:Static p:Settings.Default}, Mode=TwoWay}"
+        UseLayoutRounding="True"
+        WindowStyle="None"
         wp:WindowPlacementProperties.Placement="{Binding Placement, Source={x:Static p:Settings.Default}}"
-        wp:WindowPlacementProperties.TrackPlacement="True"
-        MouseDown="Window_MouseDown">
+        wp:WindowPlacementProperties.TrackPlacement="True">
     <Window.DataContext>
         <local:MainViewModel />
     </Window.DataContext>
@@ -40,12 +40,12 @@
                         <TextBlock Text="Height: " />
 
                         <Slider Width="64"
-                                Value="{Binding Height, Source={x:Static p:Settings.Default}, Mode=TwoWay}"
-                                Minimum="16"
+                                AutoToolTipPlacement="TopLeft"
+                                IsSnapToTickEnabled="True"
                                 Maximum="80"
+                                Minimum="16"
                                 TickFrequency="2"
-                                IsSnapToTickEnabled="True"
-                                AutoToolTipPlacement="TopLeft" />
+                                Value="{Binding Height, Source={x:Static p:Settings.Default}, Mode=TwoWay}" />
                     </StackPanel>
                 </MenuItem.Header>
             </MenuItem>
@@ -65,20 +65,20 @@
 
             <Separator />
 
-            <MenuItem Header="E_xit"
-                      Click="MenuItemExit_OnClick" />
+            <MenuItem Click="MenuItemExit_OnClick"
+                      Header="E_xit" />
         </ContextMenu>
     </Window.ContextMenu>
 
     <Viewbox Height="{Binding Height, Source={x:Static p:Settings.Default}, Mode=OneWay}">
         <Grid>
             <Grid.Background>
-                <SolidColorBrush Color="White"
-                                 Opacity="0.85" />
+                <SolidColorBrush Opacity="0.85"
+                                 Color="White" />
             </Grid.Background>
 
-            <TextBlock Text="{Binding CurrentTimeInSelectedTimeZone}"
-                       Margin="2,0,2,0" />
+            <TextBlock Margin="2,0,2,0"
+                       Text="{Binding CurrentTimeInSelectedTimeZone}" />
         </Grid>
     </Viewbox>
 </Window>