Added Viewer display defaults in VS settings

Author: Viladoman

StructLayout/Shared/Editor/EditorProcessor.cs

@@ -92,7 +92,7 @@ private string GetParserOutputDirectory()
         private void ApplyUserSettingsToWindow(LayoutWindow window, GeneralSettingsPageGrid settings)
         {
             if (window == null || settings == null) return;
-            window.SetGridNumberBase(settings.OptionViewerGridBase);
+            window.RefreshDefaults();
         }
 
         public void OnUserSettingsChanged()

StructLayout/Shared/Editor/EditorUtils.cs

@@ -25,6 +25,8 @@ static public void Initialize(StructLayoutPackage package)
         {
             Package = package;
             ServiceProvider = package;
+
+            GetGeneralSettings(); //Force a settings load and propagation
         }
 
         static public GeneralSettingsPageGrid GetGeneralSettings()

StructLayout/Shared/LayoutWindow/LayoutViewer.xaml.cs

@@ -146,22 +146,22 @@ protected override Visual GetVisualChild(int index)
 
     public partial class LayoutViewer : UserControl
     {
-        private enum DisplayAlignmentType
+        public enum DisplayAlignmentType
         {
-            Struct, 
+            Struct = 0, 
             Cacheline, 
             Custom
         }
 
         public enum DisplayMode
         {
-             Stack, 
+             Stack = 0, 
              Flat
         }
 
         public enum GridBase
         {
-            Decimal,
+            Decimal = 0,
             Hexadecimal,
         }
 
@@ -179,6 +179,10 @@ public enum GridBase
         const double MarginBottom = 25;
         const double paddingSize  = 5;
 
+        public static DisplayAlignmentType DefaultDisplayAlignment { set; get; } = DisplayAlignmentType.Struct;
+        public static DisplayMode DefaultDisplayMode { set; get; } = DisplayMode.Stack;
+        public static GridBase DefaultGridNumberBase { set; get; } = GridBase.Hexadecimal;
+
         private Typeface Font = new Typeface("Verdana");
         private Pen gridPen   = new Pen(new SolidColorBrush(Color.FromArgb(100, 0, 0, 0)), 1);
 
@@ -208,19 +212,23 @@ public enum GridBase
 
         public LayoutViewer()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             InitializeComponent();
             this.DataContext = this;
 
             overlayBrush.Opacity = 0.3;
             SetDisplayGridColumns(8);
 
+            GridNumberBase = DefaultGridNumberBase;
+
             tooltipTimer.Tick += ShowTooltip;
 
             displayAlignementComboBox.ItemsSource = Enum.GetValues(typeof(DisplayAlignmentType)).Cast<DisplayAlignmentType>();
-            displayAlignementComboBox.SelectedIndex = 0;
+            displayAlignementComboBox.SelectedIndex = (int)DefaultDisplayAlignment;
 
             displayModeComboBox.ItemsSource = Enum.GetValues(typeof(DisplayMode)).Cast<DisplayMode>();
-            displayModeComboBox.SelectedIndex = 0;
+            displayModeComboBox.SelectedIndex = (int)DefaultDisplayMode;
 
             scrollViewer.Loaded += ScrollViewer_OnLoaded;
             scrollViewer.On2DMouseScroll += ScrollViewer_On2DMouseScroll;
@@ -248,11 +256,11 @@ public void SetLayout(LayoutNode root)
             }
         }
 
-        public void SetGridNumberBase(GridBase newBase)
+        public void RefreshDefaults()
         {
-            if (newBase != GridNumberBase)
+            if (DefaultGridNumberBase != GridNumberBase)
             {
-                GridNumberBase = newBase;
+                GridNumberBase = DefaultGridNumberBase;
 
                 RenderGrid();
                 RefreshShapes();

StructLayout/Shared/LayoutWindow/LayoutWindow.cs

@@ -45,9 +45,9 @@ public void SetResult(ParseResult result)
             (this.Content as LayoutWindowControl).SetResult(result);
         }
 
-        public void SetGridNumberBase(LayoutViewer.GridBase gridBase)
+        public void RefreshDefaults()
         {
-            (this.Content as LayoutWindowControl).SetGridNumberBase(gridBase);
+            (this.Content as LayoutWindowControl).RefreshDefaults();
         }
     }
 }

StructLayout/Shared/LayoutWindow/LayoutWindowControl.xaml.cs

@@ -45,9 +45,9 @@ public void SetResult(ParseResult result)
             viewer.SetLayout(result.Layout);
         }
 
-        public void SetGridNumberBase(LayoutViewer.GridBase gridBase)
+        public void RefreshDefaults()
         {
-            viewer.SetGridNumberBase(gridBase);
+            viewer.RefreshDefaults();
         }
 
         public void OpenSettings(object a, object e)

StructLayout/Shared/StructLayoutSettings.cs

@@ -5,8 +5,6 @@ namespace StructLayout
 {
     public class GeneralSettingsPageGrid : DialogPage
     {
-        private LayoutViewer.GridBase gridNumberBase = LayoutViewer.GridBase.Hexadecimal;
-
         [Category("Parser")]
         [DisplayName("Print Command Line")]
         [Description("Print the command line argument passed to the parser in the Tool output pane")]
@@ -16,9 +14,28 @@ public class GeneralSettingsPageGrid : DialogPage
         [DisplayName("Grid Number Base")]
         [Description("Base for the numbers in the viewer grid rows and columns")]
         public LayoutViewer.GridBase OptionViewerGridBase { 
-            get { return gridNumberBase; } 
-            set { gridNumberBase = value; ThreadHelper.ThrowIfNotOnUIThread(); EditorProcessor.Instance.OnUserSettingsChanged(); } 
+            get { return LayoutViewer.DefaultGridNumberBase; } 
+            set { LayoutViewer.DefaultGridNumberBase = value; ThreadHelper.ThrowIfNotOnUIThread(); EditorProcessor.Instance.OnUserSettingsChanged(); } 
+        }
+
+        [Category("Viewer")]
+        [DisplayName("Default Display Alignment")]
+        [Description("Default value for the viewer display alignment")]
+        public LayoutViewer.DisplayAlignmentType OptionDefaultDisplayAlignment 
+        { 
+            get { return LayoutViewer.DefaultDisplayAlignment; } 
+            set { LayoutViewer.DefaultDisplayAlignment = value; }
         }
+
+        [Category("Viewer")]
+        [DisplayName("Default Display Mode")]
+        [Description("Default value for the viewer display mode")]
+        public LayoutViewer.DisplayMode OptionDefaultDisplayMode
+        {
+            get { return LayoutViewer.DefaultDisplayMode; }
+            set { LayoutViewer.DefaultDisplayMode = value; }
+        }
+
     }
 }