Skip to content

Commit

Permalink
Merge pull request #249 from DHancock/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
DHancock authored Dec 17, 2023
2 parents f7e7250 + 42c776a commit 2a5fdbe
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion SudokuSolver/Views/AboutBox.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<StackPanel Grid.Column="1">
<TextBlock Text="Sudoku Solver" FontSize="20"/>
<TextBlock Text="Version: {0}.{1}.{2}" x:Name="VersionTextBlock"/>
<TextBlock x:Name="VersionTextBlock"/>
<TextBlock><Hyperlink NavigateUri="https://github.com/DHancock/SudokuSolver">GitHub Repository</Hyperlink></TextBlock>
</StackPanel>
</Grid>
Expand Down
9 changes: 1 addition & 8 deletions SudokuSolver/Views/AboutBox.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,10 @@ public AboutBox(XamlRoot xamlRoot)
Version? v = typeof(App).Assembly.GetName().Version;

if (v is not null)
VersionTextBlock.Text = string.Format(VersionTextBlock.Text, v.Major, v.Minor, v.Build);
VersionTextBlock.Text = $"Version: {v.Major}.{v.Minor}.{v.Build}";

PrimaryButtonText = "OK";

#if DEBUG
if (App.IsPackaged)
VersionTextBlock.Text += " (P)";
else
VersionTextBlock.Text += " (D)";
#endif

Loaded += (s, e) =>
{
string fileName = ActualTheme == ElementTheme.Light ? "about_light.png" : "about_dark.png";
Expand Down
5 changes: 0 additions & 5 deletions SudokuSolver/Views/ColorsWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,10 @@ internal sealed partial class ColorsWindow : WindowBase
{
public ColorsViewModel ViewModel { get; }

private readonly InputNonClientPointerSource inputNonClientPointerSource;


public ColorsWindow()
{
this.InitializeComponent();

inputNonClientPointerSource = InputNonClientPointerSource.GetForWindowId(AppWindow.Id);

ViewModel = new ColorsViewModel();

LayoutRoot.RequestedTheme = ViewModel.Theme;
Expand Down

0 comments on commit 2a5fdbe

Please sign in to comment.