Merge pull request #181 from jeremytammik/dev_gridmenu

Dev gridmenu
jeremytammik · Jul 4, 2023 · a91e0a4 · a91e0a4
2 parents d4a9030 + f3f6de2
commit a91e0a4
Show file tree

Hide file tree

Showing 20 changed files with 230 additions and 141 deletions.
diff --git a/Contributing.md b/Contributing.md
@@ -146,7 +146,8 @@ public sealed class ElementDescriptor : Descriptor, IDescriptorConnector
     {
         if (_element is ElementType) return;
 
-        contextMenu.AddMenuItem("Show element")
+        contextMenu.AddMenuItem()
+            .SetHeader("Show element")
             .SetCommand(_element, element =>
             {
                 Application.ActionEventHandler.Raise(_ =>

diff --git a/RevitLookup.UI/ForkModificationList.md b/RevitLookup.UI/ForkModificationList.md
@@ -3,6 +3,7 @@ Fork version b711c9b3 Bump @fluentui/react-icons from 2.0.190 to 2.0.195 in /bra
 # Common
 
 Application.Current changed to Application.Current static property
+MenuBorderColorDefaultBrush replaced with ControlElevationBorderBrush
 
 # Wpf.Ui.Appearance.AppearanceData
 
@@ -109,4 +110,5 @@ New control with ItemsSourceChanged event
 
 # Wpf.Ui.Styles.Controls.MenuItem
 
-- Edited SubmenuItem Symbol trigger
+- Edited SubmenuItem Symbol trigger
+- Removed IsCheckable checkbox icon border
diff --git a/RevitLookup.UI/Styles/Controls/AutoSuggestBox.xaml b/RevitLookup.UI/Styles/Controls/AutoSuggestBox.xaml
@@ -125,7 +125,7 @@
                                 Margin="0"
                                 Padding="0,6,0,6"
                                 HorizontalAlignment="Stretch"
-                                BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                                BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                                 BorderThickness="1"
                                 CornerRadius="8"
                                 SnapsToDevicePixels="True">

diff --git a/RevitLookup.UI/Styles/Controls/ComboBox.xaml b/RevitLookup.UI/Styles/Controls/ComboBox.xaml
@@ -300,7 +300,7 @@
                                         x:Name="DropDownBorder"
                                         Margin="0"
                                         Padding="0,4,0,6"
-                                        BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                                        BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                                         BorderThickness="1"
                                         CornerRadius="{DynamicResource PopupCornerRadius}"
                                         SnapsToDevicePixels="True">

diff --git a/RevitLookup.UI/Styles/Controls/ContextMenu.xaml b/RevitLookup.UI/Styles/Controls/ContextMenu.xaml
@@ -23,7 +23,7 @@
             </Setter.Value>
         </Setter>
         <Setter Property="Background" Value="{DynamicResource SystemFillColorSolidNeutralBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource MenuBorderColorDefaultBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="MinWidth" Value="140" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Margin" Value="0" />

diff --git a/RevitLookup.UI/Styles/Controls/MenuItem.xaml b/RevitLookup.UI/Styles/Controls/MenuItem.xaml
@@ -96,7 +96,7 @@
                             x:Name="SubmenuBorder"
                             Margin="12,0,12,18"
                             Padding="0,3,0,3"
-                            BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                            BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                             BorderThickness="1"
                             CornerRadius="8"
                             SnapsToDevicePixels="True">
@@ -368,7 +368,7 @@
                         x:Name="SubmenuBorder"
                         Margin="12,10,12,18"
                         Padding="0,3,0,3"
-                        BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                        BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                         BorderThickness="1"
                         CornerRadius="8"
                         SnapsToDevicePixels="True">
@@ -533,7 +533,7 @@
                             x:Name="SubmenuBorder"
                             Margin="12,0,12,18"
                             Padding="0,3,0,3"
-                            BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                            BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                             BorderThickness="1"
                             CornerRadius="8"
                             SnapsToDevicePixels="True">
@@ -690,29 +690,16 @@
                     <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
                 </Grid.ColumnDefinitions>
 
-                <Border
-                    x:Name="CheckBoxIconBorder"
+                <TextBlock
                     Grid.Column="0"
-                    Width="20"
-                    Height="20"
-                    Margin="0"
+                    x:Name="CheckBoxIcon"
+                    Visibility="Collapsed"
+                    HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    BorderBrush="{DynamicResource ControlElevationBorderBrush}"
-                    BorderThickness="1"
-                    CornerRadius="4"
-                    Visibility="Collapsed">
-                    <Border.Background>
-                        <SolidColorBrush Color="{DynamicResource ControlFillColorDefault}" />
-                    </Border.Background>
-                    <TextBlock
-                        x:Name="CheckBoxIcon"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        FontFamily="{DynamicResource FluentSystemIcons}"
-                        FontSize="16"
-                        Text=""
-                        TextAlignment="Center" />
-                </Border>
+                    FontFamily="{DynamicResource FluentSystemIcons}"
+                    FontSize="16"
+                    Text="&#xF294;"
+                    TextAlignment="Center" />
 
                 <ContentPresenter
                     x:Name="Icon"
@@ -762,11 +749,12 @@
                 <!-- <Setter TargetName="SymbolIcon" Property="Margin" Value="0" /> -->
             </Trigger>
             <Trigger Property="IsCheckable" Value="True">
-                <Setter TargetName="CheckBoxIconBorder" Property="Visibility" Value="Visible" />
-                <Setter TargetName="CheckBoxIconBorder" Property="Margin" Value="0,0,6,0" />
+                <Setter TargetName="CheckBoxIcon" Property="Visibility" Value="Hidden" />
+                <Setter TargetName="CheckBoxIcon" Property="Margin" Value="0,0,6,0" />
+                <Setter TargetName="SymbolIcon" Property="Visibility" Value="Collapsed" />
             </Trigger>
             <Trigger Property="IsChecked" Value="True">
-                <Setter TargetName="CheckBoxIcon" Property="Text" Value="&#xF294;" />
+                <Setter TargetName="CheckBoxIcon" Property="Visibility" Value="Visible" />
             </Trigger>
             <Trigger Property="IsEnabled" Value="False">
                 <Setter Property="Foreground">
@@ -850,7 +838,7 @@
                         x:Name="SubmenuBorder"
                         Margin="12,10,12,18"
                         Padding="0,3,0,3"
-                        BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                        BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                         BorderThickness="1"
                         CornerRadius="8"
                         SnapsToDevicePixels="True">

diff --git a/RevitLookup.UI/Styles/Controls/ToolBar.xaml b/RevitLookup.UI/Styles/Controls/ToolBar.xaml
@@ -240,7 +240,7 @@
                                         x:Name="DropDownBorder"
                                         Margin="12,0,12,18"
                                         Padding="0,3,0,3"
-                                        BorderBrush="{DynamicResource MenuBorderColorDefaultBrush}"
+                                        BorderBrush="{DynamicResource ControlElevationBorderBrush}"
                                         BorderThickness="1"
                                         CornerRadius="8"
                                         SnapsToDevicePixels="True">

diff --git a/RevitLookup/Core/ComponentModel/Descriptors/CurveDescriptor.cs b/RevitLookup/Core/ComponentModel/Descriptors/CurveDescriptor.cs
@@ -24,11 +24,11 @@
 using System.Windows.Controls;
 #if R23_OR_GREATER
 using System.Windows.Input;
+using RevitLookup.Views.Extensions;
 #endif
 using Autodesk.Revit.DB;
 using RevitLookup.Core.Contracts;
 using RevitLookup.Core.Objects;
-using RevitLookup.Views.Extensions;
 
 namespace RevitLookup.Core.ComponentModel.Descriptors;
 
@@ -45,7 +45,8 @@ public CurveDescriptor(Curve curve)
     public void RegisterMenu(ContextMenu contextMenu, UIElement bindableElement)
     {
 #if R23_OR_GREATER
-        contextMenu.AddMenuItem("Show curve")
+        contextMenu.AddMenuItem()
+            .SetHeader("Show curve")
             .SetCommand(_curve, curve =>
             {
                 Application.ActionEventHandler.Raise(_ =>

diff --git a/RevitLookup/Core/ComponentModel/Descriptors/EdgeDescriptor.cs b/RevitLookup/Core/ComponentModel/Descriptors/EdgeDescriptor.cs
@@ -23,28 +23,33 @@
 using System.Windows.Controls;
 #if R23_OR_GREATER
 using System.Windows.Input;
+using RevitLookup.Views.Extensions;
 #endif
 using Autodesk.Revit.DB;
 using RevitLookup.Core.Contracts;
 using RevitLookup.Core.Objects;
-using RevitLookup.Views.Extensions;
 
 namespace RevitLookup.Core.ComponentModel.Descriptors;
 
 public sealed class EdgeDescriptor : Descriptor, IDescriptorCollector, IDescriptorConnector
 {
+#if R23_OR_GREATER
     private readonly Edge _edge;
 
+#endif
     public EdgeDescriptor(Edge edge)
     {
+#if R23_OR_GREATER
         _edge = edge;
+#endif
         Name = $"{edge.ApproximateLength.ToString(CultureInfo.InvariantCulture)} ft";
     }
 
     public void RegisterMenu(ContextMenu contextMenu, UIElement bindableElement)
     {
 #if R23_OR_GREATER
-        contextMenu.AddMenuItem("Show edge")
+        contextMenu.AddMenuItem()
+            .SetHeader("Show edge")
             .SetCommand(_edge, edge =>
             {
                 Application.ActionEventHandler.Raise(_ =>

diff --git a/RevitLookup/Core/ComponentModel/Descriptors/ElementDescriptor.cs b/RevitLookup/Core/ComponentModel/Descriptors/ElementDescriptor.cs
@@ -44,7 +44,8 @@ public void RegisterMenu(ContextMenu contextMenu, UIElement bindableElement)
     {
         if (_element is ElementType) return;
 
-        contextMenu.AddMenuItem("Show element")
+        contextMenu.AddMenuItem()
+            .SetHeader("Show element")
             .SetCommand(_element, element =>
             {
                 Application.ActionEventHandler.Raise(_ =>

diff --git a/RevitLookup/Core/ComponentModel/Descriptors/FaceDescriptor.cs b/RevitLookup/Core/ComponentModel/Descriptors/FaceDescriptor.cs
@@ -23,28 +23,33 @@
 using System.Windows.Controls;
 #if R23_OR_GREATER
 using System.Windows.Input;
+using RevitLookup.Views.Extensions;
 #endif
 using Autodesk.Revit.DB;
 using RevitLookup.Core.Contracts;
 using RevitLookup.Core.Objects;
-using RevitLookup.Views.Extensions;
 
 namespace RevitLookup.Core.ComponentModel.Descriptors;
 
 public sealed class FaceDescriptor : Descriptor, IDescriptorCollector, IDescriptorConnector
 {
+#if R23_OR_GREATER
     private readonly Face _face;
 
+#endif
     public FaceDescriptor(Face face)
     {
+#if R23_OR_GREATER
         _face = face;
+#endif
         Name = $"{face.Area.ToString(CultureInfo.InvariantCulture)} ft²";
     }
 
     public void RegisterMenu(ContextMenu contextMenu, UIElement bindableElement)
     {
 #if R23_OR_GREATER
-        contextMenu.AddMenuItem("Show face")
+        contextMenu.AddMenuItem()
+            .SetHeader("Show face")
             .SetCommand(_face, face =>
             {
                 Application.ActionEventHandler.Raise(_ =>

diff --git a/RevitLookup/Core/ComponentModel/Descriptors/FamilyManagerDescriptor.cs b/RevitLookup/Core/ComponentModel/Descriptors/FamilyManagerDescriptor.cs
@@ -18,7 +18,6 @@
 // Software - Restricted Rights) and DFAR 252.227-7013(c)(1)(ii)
 // (Rights in Technical Data and Computer Software), as applicable.
 
-using System.Collections;
 using System.Reflection;
 using Autodesk.Revit.DB;
 using RevitLookup.Core.Contracts;

diff --git a/RevitLookup/Core/ComponentModel/Descriptors/SolidDescriptor.cs b/RevitLookup/Core/ComponentModel/Descriptors/SolidDescriptor.cs
@@ -23,28 +23,33 @@
 using System.Windows.Controls;
 #if R23_OR_GREATER
 using System.Windows.Input;
+using RevitLookup.Views.Extensions;
 #endif
 using Autodesk.Revit.DB;
 using RevitLookup.Core.Contracts;
 using RevitLookup.Core.Objects;
-using RevitLookup.Views.Extensions;
 
 namespace RevitLookup.Core.ComponentModel.Descriptors;
 
 public sealed class SolidDescriptor : Descriptor, IDescriptorCollector, IDescriptorConnector
 {
+#if R23_OR_GREATER
     private readonly Solid _solid;
 
+#endif
     public SolidDescriptor(Solid solid)
     {
+#if R23_OR_GREATER
         _solid = solid;
+#endif
         Name = $"{solid.Volume.ToString(CultureInfo.InvariantCulture)} ft³";
     }
 
     public void RegisterMenu(ContextMenu contextMenu, UIElement bindableElement)
     {
 #if R23_OR_GREATER
-        contextMenu.AddMenuItem("Show solid")
+        contextMenu.AddMenuItem()
+            .SetHeader("Show solid")
             .SetCommand(_solid, solid =>
             {
                 Application.ActionEventHandler.Raise(_ =>

diff --git a/RevitLookup/Services/SoftwareUpdateService.cs b/RevitLookup/Services/SoftwareUpdateService.cs
@@ -44,13 +44,13 @@ public SoftwareUpdateService(IConfiguration configuration)
         _writeAccess = configuration.GetValue<string>("FolderAccess") == "Write";
     }
 
-    public SoftwareUpdateState State { get; set; }
+    public SoftwareUpdateState State { get; private set; }
     public string CurrentVersion { get; }
-    public string NewVersion { get; set; }
-    public string LatestCheckDate { get; set; }
-    public string ReleaseNotesUrl { get; set; }
-    public string ErrorMessage { get; set; }
-    public string LocalFilePath { get; set; }
+    public string NewVersion { get; private set; }
+    public string LatestCheckDate { get; private set; }
+    public string ReleaseNotesUrl { get; private set; }
+    public string ErrorMessage { get; private set; }
+    public string LocalFilePath { get; private set; }
 
     public async Task CheckUpdates()
     {

diff --git a/RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs b/RevitLookup/Views/Dialogs/UnitsDialog.xaml.cs
@@ -44,12 +44,16 @@ private void OnRowLoaded(object sender, RoutedEventArgs routedEventArgs)
 
     private void CreateTreeContextMenu(UnitInfo info, FrameworkElement row)
     {
-        row.ContextMenu = new ContextMenu();
-        row.ContextMenu.AddMenuItem(Resources["CopyMenuItem"])
+        row.ContextMenu = new ContextMenu
+        {
+            Resources = Resources
+        };
+
+        row.ContextMenu.AddMenuItem("CopyMenuItem")
             .SetHeader("Copy unit")
             .SetCommand(info, parameter => Clipboard.SetText(parameter.Unit))
             .SetShortcut(row, ModifierKeys.Control, Key.C);
-        row.ContextMenu.AddMenuItem(Resources["CopyMenuItem"])
+        row.ContextMenu.AddMenuItem("CopyMenuItem")
             .SetHeader("Copy label")
             .SetCommand(info, parameter => Clipboard.SetText(parameter.Label))
             .SetShortcut(row, ModifierKeys.Control | ModifierKeys.Shift, Key.C);