Fix inconsistent naming

sirdoombox · Mar 16, 2020 · bf44aa1 · bf44aa1
1 parent 221416f
commit bf44aa1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/PostScriptumMortarCalculator/Models/UserConfigModel.cs b/PostScriptumMortarCalculator/Models/UserConfigModel.cs
@@ -11,8 +11,8 @@ public class UserConfigModel
         [JsonProperty] public double GridOpacity { get; set; } = 0.25d;
         [JsonProperty] public string LastMapName { get; set; }
         [JsonProperty] public string LastMortarName { get; set; }
-        [JsonProperty] public Color MortarIndicatorColor { get; set; } = Colors.Blue;
-        [JsonProperty] public Color TargetIndicatorColor { get; set; } = Colors.Red;
+        [JsonProperty] public Color MortarIndicatorColour { get; set; } = Colors.Blue;
+        [JsonProperty] public Color TargetIndicatorColour { get; set; } = Colors.Red;
 
     }
 }
diff --git a/PostScriptumMortarCalculator/ViewModels/UserConfigViewModel.cs b/PostScriptumMortarCalculator/ViewModels/UserConfigViewModel.cs
@@ -39,8 +39,8 @@ public UserConfigViewModel(ConfigService configService, IEventAggregator eventAg
                 .Select(x => x.BaseColorScheme));
             SelectedTheme = m_configModel.Theme;
             SelectedAccent = m_configModel.Accent;
-            MortarIndicatorColour = m_configModel.MortarIndicatorColor;
-            TargetIndicatorColour = m_configModel.TargetIndicatorColor;
+            MortarIndicatorColour = m_configModel.MortarIndicatorColour;
+            TargetIndicatorColour = m_configModel.TargetIndicatorColour;
         }
 
         protected override void OnPropertyChanged(string propertyName)
@@ -61,15 +61,15 @@ public void OnSelectedThemeChanged()
             ThemeManager.ChangeThemeBaseColor(Application.Current, SelectedTheme);
         }
 
-        public void OnMortarIndicatorColorChanged()
+        public void OnMortarIndicatorColourChanged()
         {
-            m_configModel.MortarIndicatorColor = MortarIndicatorColour;
+            m_configModel.MortarIndicatorColour = MortarIndicatorColour;
             m_eventAggregator.Publish(new ColorChangedEvent(ColorChangedEvent.Type.Mortar, MortarIndicatorColour));
         }
 
-        public void OnTargetIndicatorColorChanged()
+        public void OnTargetIndicatorColourChanged()
         {
-            m_configModel.TargetIndicatorColor = TargetIndicatorColour;
+            m_configModel.TargetIndicatorColour = TargetIndicatorColour;
             m_eventAggregator.Publish(new ColorChangedEvent(ColorChangedEvent.Type.Target, TargetIndicatorColour));
         }
     }

diff --git a/PostScriptumMortarCalculator/Views/UserConfigView.xaml b/PostScriptumMortarCalculator/Views/UserConfigView.xaml
@@ -40,7 +40,7 @@
                     <Setter Property="Margin" Value="{StaticResource ControlMargin}" />
                     <Style.Resources>
                         <Style TargetType="Label">
-                            <Setter Property="MinWidth" Value="200"/>
+                            <Setter Property="MinWidth" Value="175"/>
                             <Setter Property="DockPanel.Dock" Value="Left" />
                             <Setter Property="HorizontalAlignment" Value="Left" />
                             <Setter Property="VerticalAlignment" Value="Top" />