Merge pull request #168 from reactivemarbles/CP_RemoveSystemWindowsForms

Remove System Windows Forms

Author: ChrisPulman

src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml

@@ -123,7 +123,7 @@
                             Icon="{TemplateBinding Icon}"
                             IconPlacement="Right"
                             PlaceholderText="{TemplateBinding PlaceholderText}"
-                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=OneWayToSource, UpdateSourceTrigger=PropertyChanged}" />
+                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Text, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
                         <Popup
                             x:Name="PART_SuggestionsPopup"

src/CrissCross.WPF.UI/Controls/IconElement/FontIcon.cs

@@ -126,14 +126,15 @@ public string? Glyph
     /// <returns>A UIElement.</returns>
     protected override UIElement InitializeChildren()
     {
-        if (VisualParent is not null)
-        {
-            FontSize = TextElement.GetFontSize(VisualParent);
-        }
-
         if (FontSize.Equals(SystemFonts.MessageFontSize))
         {
             SetResourceReference(FontSizeProperty, "DefaultIconFontSize");
+
+            // If the FontSize is the default, set it to the parent's FontSize.
+            if (VisualParent is not null && TextElement.GetFontSize(VisualParent) != SystemFonts.MessageFontSize)
+            {
+                SetCurrentValue(FontSizeProperty, TextElement.GetFontSize(VisualParent));
+            }
         }
 
         TextBlock = new TextBlock

src/CrissCross.WPF.UI/Controls/ListBox/ListBoxItem.xaml

@@ -27,6 +27,9 @@
                         <ContentPresenter />
                     </Border>
                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MenuBarItemBackgroundSelected}" />
+                        </Trigger>
                         <Trigger Property="IsSelected" Value="True">
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource ListBoxItemSelectedBackgroundThemeBrush}" />
                             <Setter Property="Foreground" Value="{DynamicResource ListBoxItemSelectedForegroundThemeBrush}" />

src/CrissCross.WPF.UI/Controls/ListView/ListView.cs

@@ -28,6 +28,8 @@ public class ListView : System.Windows.Controls.ListView
     /// <summary>Identifies the <see cref="ViewState"/> dependency property.</summary>
     public static readonly DependencyProperty ViewStateProperty = DependencyProperty.Register(nameof(ViewState), typeof(ListViewViewState), typeof(ListView), new FrameworkPropertyMetadata(ListViewViewState.Default, OnViewStateChanged));
 
+    private DependencyPropertyDescriptor? _descriptor;
+
     static ListView() => DefaultStyleKeyProperty.OverrideMetadata(typeof(ListView), new FrameworkPropertyMetadata(typeof(ListView)));
 
     /// <summary>
@@ -66,12 +68,23 @@ private static void OnViewStateChanged(DependencyObject d, DependencyPropertyCha
 
     private void OnLoaded(object sender, RoutedEventArgs e)
     {
-        Loaded -= OnLoaded; // prevent memory leaks
+        // prevent memory leaks
+        Loaded -= OnLoaded;
+        Unloaded += OnUnloaded;
 
         // Setup initial ViewState and hook into View property changes
-        var descriptor = DependencyPropertyDescriptor.FromProperty(System.Windows.Controls.ListView.ViewProperty, typeof(System.Windows.Controls.ListView));
-        descriptor?.AddValueChanged(this, OnViewPropertyChanged);
-        UpdateViewState(); // set the initial state
+        _descriptor = DependencyPropertyDescriptor.FromProperty(System.Windows.Controls.ListView.ViewProperty, typeof(System.Windows.Controls.ListView));
+        _descriptor?.AddValueChanged(this, OnViewPropertyChanged);
+
+        // set the initial state
+        UpdateViewState();
+    }
+
+    private void OnUnloaded(object sender, RoutedEventArgs e)
+    {
+        Unloaded -= OnUnloaded;
+
+        _descriptor?.RemoveValueChanged(this, OnViewPropertyChanged);
     }
 
     private void OnViewPropertyChanged(object? sender, EventArgs e) => UpdateViewState();

src/CrissCross.WPF.UI/Controls/NumberPad/NumberPad.xaml.cs

@@ -99,7 +99,6 @@ public NumberPad(INumberPadButton newOwner)
                 if (Value.Value.HasValue && Value.Value!.Value <= _owner.Maximum && Value.Value.Value >= _owner.Minimum)
                 {
                     _limitsTimer?.Stop();
-                    ////Value.Background = Brushes.White;
                 }
             },
             Dispatcher);
@@ -319,41 +318,14 @@ private void Showkeypad()
         {
             // Get the current screen
             WindowInteropHelper wih = new(window);
-
-            // TODO: Replace WinForms with Native calls
-            ////var monitor = MonitorFromWindow(wih.Handle, MONITOR_DEFAULTTONEAREST);
-
-            ////var monitorInfo = new NativeMonitorInfo();
-            ////if (monitor != IntPtr.Zero)
-            ////{
-            ////    GetMonitorInfo(monitor, monitorInfo);
-
-            ////    var left = monitorInfo.Monitor.Left;
-            ////    var top = monitorInfo.Monitor.Top;
-            ////    var width = monitorInfo.Monitor.Right - monitorInfo.Monitor.Left;
-            ////    var height = monitorInfo.Monitor.Bottom - monitorInfo.Monitor.Top;
-            ////}
-
-            var screen = System.Windows.Forms.Screen.FromHandle(wih.Handle);
-
-            // Get all the screens and identify the primary
-            List<System.Drawing.Rectangle> screens = [];
-            var primaryScreen = -1;
-            var scr = 0;
-            foreach (var s in System.Windows.Forms.Screen.AllScreens)
+            if (User32.MonitorFromWindow(wih.Handle, User32.MONITOR_DEFAULTTONEAREST) is IntPtr monitor && monitor != IntPtr.Zero)
             {
-                screens.Add(s.Bounds);
-                if (s.Primary)
-                {
-                    primaryScreen = scr;
-                }
+                var monitorInfo = new User32.NativeMonitorInfo();
+                User32.GetMonitorInfo(monitor, monitorInfo);
 
-                scr++;
+                Left = monitorInfo.Monitor.Left;
+                Top = monitorInfo.Monitor.Top;
             }
-
-            Top = screen.Bounds.Location.Y;
-            var curScreen = screens.FindIndex(x => x == screen.Bounds);
-            Left = curScreen <= primaryScreen ? screen.Bounds.Location.X : screen.Bounds.Width;
         }
         else
         {
@@ -369,12 +341,10 @@ private void Showkeypad()
         if (window != null && button != null && presentationSource != null)
         {
             var ownerPosition = button.TransformToAncestor(presentationSource.RootVisual).Transform(new Point(0, 0));
-            var windowPosition = window.PointToScreen(default);
 
             // Set the top position of the Keypad
             _margin[1] = ownerPosition.Y - 100;
 
-            // WGrid.Height = 366
             if ((_margin[1] + WGrid.Height) > window.ActualHeight)
             {
                 _margin[1] = window.ActualHeight - WGrid.Height - 10;
@@ -392,7 +362,6 @@ private void Showkeypad()
                 _margin[2] = ownerPosition.X + button.ActualWidth + 10;
             }
 
-            // WGrid.Width = 206
             if ((_margin[2] + WGrid.Width) > (window.ActualWidth - 10))
             {
                 // Set location to left of button if the location + with of keypad will be off

src/CrissCross.WPF.UI/Controls/NumericPushButton/NumericPushButton.cs

@@ -17,7 +17,7 @@ public class NumericPushButton : System.Windows.Controls.Button, INumberPadButto
     /// <summary>
     /// Defaults decimal points.
     /// </summary>
-    public static readonly DependencyProperty DecimalPlaceProperty =
+    public static readonly DependencyProperty DecimalPlacesProperty =
         DependencyProperty.Register(
             nameof(DecimalPlaces),
             typeof(int),
@@ -202,9 +202,9 @@ public NumericPushButton()
     [Category("Common")]
     public int DecimalPlaces
     {
-        get => (int)GetValue(DecimalPlaceProperty);
+        get => (int)GetValue(DecimalPlacesProperty);
 
-        set => SetValue(DecimalPlaceProperty, value);
+        set => SetValue(DecimalPlacesProperty, value);
     }
 
     /// <summary>

src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj

@@ -15,10 +15,6 @@
     <DefineConstants>$(DefineConstants);LACKS_STREAM_MEMORY_OVERLOADS</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework.StartsWith('net46'))">
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>