Merge pull request #72 from DHancock/current

Current
DHancock · Dec 23, 2020 · 8536d6c · 8536d6c
2 parents 591f6fd + 7cfb31b
commit 8536d6c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/SudokuSolver/Common/CellBase.cs b/SudokuSolver/Common/CellBase.cs
@@ -65,7 +65,7 @@ public bool Equals(CellBase? other)
             if (HasValue)
             {
                 if (other.HasValue)
-                    return Value == other.Value;
+                    return (Value == other.Value) && (Origin == other.Origin);
 
                 return false;
             }

diff --git a/SudokuSolver/SudokuSolver.csproj b/SudokuSolver/SudokuSolver.csproj
@@ -4,21 +4,21 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
-    <Version>0.3.0</Version>
+    <Version>1.0.0</Version>
     <Authors>David Hancock</Authors>
     <Company>[email protected]</Company>
     <Copyright>David Hancock 2020</Copyright>
     <PackageId>SudokuSolver</PackageId>
     <RepositoryUrl>https://github.com/DHancock/SudokuSolver</RepositoryUrl>
     <RepositoryType></RepositoryType>
     <NeutralLanguage>En</NeutralLanguage>
-    <PackageReleaseNotes>pre-release version</PackageReleaseNotes>
+    <PackageReleaseNotes></PackageReleaseNotes>
     <Product>SudokuSolver</Product>
     <AssemblyName>SudokuSolver</AssemblyName>
     <RootNamespace>Sudoku</RootNamespace>
     <ApplicationIcon>app.ico</ApplicationIcon>
-    <AssemblyVersion>0.3.0.0</AssemblyVersion>
-    <FileVersion>0.3.0.0</FileVersion>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ApplicationManifest>app.manifest</ApplicationManifest>

diff --git a/SudokuSolver/ViewModels/PuzzleViewModel.cs b/SudokuSolver/ViewModels/PuzzleViewModel.cs
@@ -30,6 +30,21 @@ public PuzzleViewModel()
         }
 
 
+        public PuzzleViewModel(PuzzleViewModel source)
+        {
+            Model = new PuzzleModel(source.Model);
+            Cells = new CellList(CellChanged_EventHandler);
+            ClearCommand = new RelayCommand(ClearCommandHandler, o => Cells.NotEmpty);
+
+            foreach (Models.Cell cell in Model.Cells)
+                Cells.UpdateCell(cell);
+
+            DarkThemed = source.DarkThemed;
+            ShowPossibles = source.ShowPossibles;
+            AccentTitleBar = source.AccentTitleBar;
+        }
+
+
         // an empty implementation used to indicate no action is required
         // when the user changes a cell. As the code supports nullable using
         // this avoids the need to return a null function delegate.

diff --git a/SudokuSolver/Views/Cell.xaml b/SudokuSolver/Views/Cell.xaml
@@ -71,7 +71,7 @@
         <TextBlock x:Name="PossibleValue3" Text="4" Canvas.Top="16" Canvas.Left="4"/>
         <TextBlock x:Name="PossibleValue4" Text="5" Canvas.Top="16" Canvas.Left="22"/>
         <TextBlock x:Name="PossibleValue5" Text="6" Canvas.Top="16" Canvas.Left="39"/>
-        <TextBlock x:Name="PossibleValue6" Text="7" Canvas.Top="34" Canvas.Left="5"/>
+        <TextBlock x:Name="PossibleValue6" Text="7" Canvas.Top="34" Canvas.Left="4"/>
         <TextBlock x:Name="PossibleValue7" Text="8" Canvas.Top="34" Canvas.Left="22"/>
         <TextBlock x:Name="PossibleValue8" Text="9" Canvas.Top="34" Canvas.Left="39"/>
     </Canvas>

diff --git a/SudokuSolver/Views/MainWindow.xaml b/SudokuSolver/Views/MainWindow.xaml
@@ -62,7 +62,7 @@
             <MenuItem Header="_Options">
                 <MenuItem Header="_Show possibles" IsCheckable="True" IsChecked="{Binding ShowPossibles}"/>
                 <Separator />
-                <MenuItem Header="_Dark theme" IsCheckable="True" IsChecked="{Binding DarkThemed, Mode=OneWayToSource}" Checked="DarkThemeCheckedHandler" Unchecked="DarkThemeUncheckedHandler"/>
+                <MenuItem Header="_Dark theme" IsCheckable="True" IsChecked="{Binding DarkThemed, Mode=OneWay}" Checked="DarkThemeCheckedHandler" Unchecked="DarkThemeUncheckedHandler"/>
             </MenuItem>
         </Menu>
 

diff --git a/SudokuSolver/Views/MainWindow.xaml.cs b/SudokuSolver/Views/MainWindow.xaml.cs
@@ -52,7 +52,7 @@ private void ProcessCommandLine(string[] args)
 
         private void InitializeTheme()
         {
-            if (!WindowsThemeHelper.AppsUseLightTheme())
+            if (WindowsThemeHelper.GetWindowsBaseColor() == ThemeManager.BaseColorDark)
                 SetTheme(dark: true);
 
             ((PuzzleViewModel)DataContext).AccentTitleBar = WindowsThemeHelper.ShowAccentColorOnTitleBarsAndWindowBorders();
@@ -75,10 +75,17 @@ private void PrintExecutedHandler(object sender, ExecutedRoutedEventArgs e)
                 PuzzleView puzzleView = new PuzzleView
                 {
                     Padding = new Thickness(Math.Min(printDialog.PrintableAreaHeight, printDialog.PrintableAreaWidth) * (cMarginsPercentage / 100D)),
-                    Background = this.Background,
-                    Foreground = this.Foreground,
-                    DataContext = this.DataContext
                 };
+
+                if (((PuzzleViewModel)DataContext).DarkThemed)
+                {
+                    PuzzleViewModel clone = new PuzzleViewModel((PuzzleViewModel)DataContext);
+                    clone.DarkThemed = false;
+                    puzzleView.DataContext = clone;
+                    ThemeManager.Current.ChangeThemeBaseColor(puzzleView, ThemeManager.BaseColorLight);
+                }
+                else
+                    puzzleView.DataContext = DataContext; 
 
                 printDialog.PrintVisual(puzzleView, "Sudoku puzzle");
             }