Fixed an issue that caused the locations panel fill orientation to no…

…t change with the layout in some cases.
trippsc2 · May 13, 2020 · 18feb96 · 18feb96
1 parent 53bf3d2
commit 18feb96
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/OpenTracker/GlobalSuppressions.cs b/OpenTracker/GlobalSuppressions.cs
@@ -37,3 +37,4 @@
 [assembly: SuppressMessage("Naming", "CA1710:Identifiers should have correct suffix", Justification = "ObservableDictionary is a dictionary-type class.", Scope = "type", Target = "~T:OpenTracker.Utils.ObservableDictionary`2")]
 [assembly: SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "Necessary use of static public field.", Scope = "member", Target = "~F:OpenTracker.App.Selector")]
 [assembly: SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "AvaloniaProperty must be public fields for binding.", Scope = "member", Target = "~F:OpenTracker.Views.MainWindow.SelectorProperty")]
+[assembly: SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "AvaloniaProperty must be public fields for binding.", Scope = "member", Target = "~F:OpenTracker.Views.MainWindow.LocationsPanelOrientationProperty")]
diff --git a/OpenTracker/Views/MainWindow.xaml b/OpenTracker/Views/MainWindow.xaml
@@ -519,7 +519,7 @@
 							<ItemsControl.ItemsPanel>
 								<ItemsPanelTemplate>
 									<WrapPanel Orientation="{Binding RelativeSource={RelativeSource AncestorType=view:MainWindow},
-										   Path=MapPanelOrientation, Mode=OneWay}" />
+										   Path=LocationsPanelOrientation, Mode=OneWay}" />
 								</ItemsPanelTemplate>
 							</ItemsControl.ItemsPanel>
 

diff --git a/OpenTracker/Views/MainWindow.xaml.cs b/OpenTracker/Views/MainWindow.xaml.cs
@@ -106,6 +106,14 @@ public bool ModeSettingsPopupOpen
             set => SetValue(ModeSettingsPopupOpenProperty, value);
         }
 
+        public static AvaloniaProperty<Orientation> LocationsPanelOrientationProperty =
+            AvaloniaProperty.Register<MainWindow, Orientation>(nameof(LocationsPanelOrientation));
+        public Orientation LocationsPanelOrientation
+        {
+            get => GetValue(LocationsPanelOrientationProperty);
+            set => SetValue(LocationsPanelOrientationProperty, value);
+        }
+
         public static AvaloniaProperty<string> CurrentFilePathProperty =
             AvaloniaProperty.Register<MainWindow, string>(nameof(CurrentFilePath));
         public string CurrentFilePath
@@ -195,6 +203,8 @@ private void ChangeLayout(Rect bounds)
 
         private void HorizontalLayout()
         {
+            LocationsPanelOrientation = Orientation.Horizontal;
+
             if (ViewModel.HorizontalUIPanelPlacement == Models.Enums.VerticalAlignment.Top)
                 UIPanelDock = Dock.Top;
             else
@@ -231,6 +241,8 @@ private void HorizontalLayout()
 
         private void VerticalLayout()
         {
+            LocationsPanelOrientation = Orientation.Vertical;
+
             if (ViewModel.VerticalUIPanelPlacement == Models.Enums.HorizontalAlignment.Left)
                 UIPanelDock = Dock.Left;
             else