Skip to content

Commit f632a67

Browse files
Minor UI adjustments
1 parent 301edbd commit f632a67

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

src/Otor.MsixHero.App/Modules/WhatsNew/ViewModels/WhatsNewViewModel.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ private void OnDismiss()
7171
initialScreenHelper.GoToDefaultScreenAsync();
7272
}
7373

74+
// ReSharper disable once PossibleNullReferenceException
75+
public string CurrentVersionLine => (Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()).GetName().Version.ToString(2);
76+
7477
// ReSharper disable once PossibleNullReferenceException
7578
public string CurrentVersion => (Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()).GetName().Version.ToString(3);
7679

src/Otor.MsixHero.App/Modules/WhatsNew/Views/WhatsNewView.xaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<Label DockPanel.Dock="Top" FontSize="36" Style="{StaticResource Label}">
1515
<TextBlock>
1616
<Run Text="Welcome to MSIX Hero" />
17-
<Run Text="{Binding CurrentVersion, Mode=OneWay, FallbackValue='1.0'}" />
17+
<Run Text="{Binding CurrentVersionLine, Mode=OneWay, FallbackValue='1.0'}" />
1818
</TextBlock>
1919
</Label>
2020
<TextBlock DockPanel.Dock="Top">
@@ -27,13 +27,15 @@
2727
</Hyperlink>
2828
</TextBlock>
2929

30-
<CheckBox IsChecked="{Binding ShowUpdateScreen}" DockPanel.Dock="Top" Content="Show this screen each time MSIX Hero gets updated" Margin="0 10" />
30+
<Button Background="#BEE6FD" BorderBrush="#BEE6FD" Padding="16 8" FontSize="16" DockPanel.Dock="Top" Command="{Binding Dismiss}" Content="{Binding Caption, FallbackValue='Close this dialog and jump to the Packages screen'}" HorizontalAlignment="Left" Margin="0 12 0 4" />
3131

32-
<Button Background="#BEE6FD" BorderBrush="#BEE6FD" Padding="16 8" FontSize="16" DockPanel.Dock="Top" Command="{Binding Dismiss}" Content="{Binding Caption}" HorizontalAlignment="Left" Margin="0 0 0 0" />
32+
<CheckBox IsChecked="{Binding ShowUpdateScreen}" DockPanel.Dock="Top" Content="Display this information after each update" Margin="0 4" />
3333

34-
<Separator DockPanel.Dock="Top" Margin="0 10 " />
34+
<Separator DockPanel.Dock="Top" Margin="0 8 " />
3535

36+
<Label Margin="0 0 0 8" DockPanel.Dock="Top" FontSize="24" Style="{StaticResource Label}" Content="What's new in version 2.0" />
3637
<TabControl
38+
Margin="16"
3739
SelectedIndex="0"
3840
mvvm:RegionManager.RegionName="{x:Static whatsNew:WhatsNewRegionNames.Master}">
3941
<TabControl.Style>
@@ -84,7 +86,7 @@
8486
</StackPanel>
8587
</Border>
8688
<Border DockPanel.Dock="Top">
87-
<transitionContentControl:TransitioningContentControl
89+
<transitionContentControl:TransitioningContentControl
8890
x:Name="PART_SelectedContentHost"
8991
HorizontalContentAlignment="Stretch"
9092
VerticalContentAlignment="Stretch"
@@ -100,5 +102,6 @@
100102
</Style>
101103
</TabControl.Style>
102104
</TabControl>
105+
103106
</DockPanel>
104107
</UserControl>

src/Otor.MsixHero.App/Themes/Buttons.xaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@
8686
BorderBrush="{TemplateBinding BorderBrush}"
8787
Background="{TemplateBinding Background}">
8888
<DockPanel Margin="{TemplateBinding Padding}">
89-
<Path VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Width="16" Height="16" DockPanel.Dock="Right" Margin="4 0 0 0" Data="M 1.726563 4.015625 L 1.023438 4.734375 L 7.5 11.074219 L 13.972656 4.734375 L 13.277344 4.015625 L 7.5 9.675781 Z" Fill="{TemplateBinding Foreground}" />
89+
<Path
90+
SnapsToDevicePixels="True"
91+
UseLayoutRounding="True"
92+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Width="10" Height="5" DockPanel.Dock="Right" Margin="6 0 2 0" Data="M 0 0 10 0 5 5 Z" Fill="{TemplateBinding Foreground}" />
9093
<ContentPresenter VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
9194
</DockPanel>
9295
</Border>

0 commit comments

Comments
 (0)