Added ScrollViewer for small screen support

OliBomby · Jul 21, 2021 · 711c79b · 711c79b
1 parent 96fa2fc
commit 711c79b
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 13 deletions.
diff --git a/Mapping_Tools/MainWindow.xaml b/Mapping_Tools/MainWindow.xaml
@@ -123,7 +123,10 @@
                     </Grid>
                     <Separator Background="{DynamicResource MaterialDesignDivider}" Grid.Row="1" />
                     <Grid x:Name="ThirdGrid" Grid.Row="2">
-                        <ContentControl Margin="20" Name="content_views" Content="{Binding}"></ContentControl>
+
+                        <ScrollViewer x:Name="ContentScroller" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                            <ContentControl Margin="20" Name="content_views" Content="{Binding}"></ContentControl>
+                        </ScrollViewer>
 
                         <materialDesign:Snackbar x:Name="MainSnackbar" />
                     </Grid>

diff --git a/Mapping_Tools/MainWindow.xaml.cs b/Mapping_Tools/MainWindow.xaml.cs
@@ -206,19 +206,31 @@ private void SetCurrentView(Type type) {
         }
 
         public void SetCurrentView(object view) {
-            if( view == null )
+            if (view == null)
                 return;
 
             var type = view.GetType();
 
-            if( FindName("header") is TextBlock txt ) {
+            if (FindName("header") is TextBlock txt) {
                 txt.Text = type.GetCustomAttribute<DontShowTitleAttribute>() == null ? $"Mapping Tools - {ViewCollection.GetName(type)}" : "Mapping Tools";
             }
 
-            if( DataContext is MappingTool mt ) {
+            if (type.GetCustomAttribute<VerticalContentScrollAttribute>() != null) {
+                ContentScroller.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+            } else {
+                ContentScroller.VerticalScrollBarVisibility = ScrollBarVisibility.Disabled;
+            }
+
+            if (type.GetCustomAttribute<HorizontalContentScrollAttribute>() != null) {
+                ContentScroller.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+            } else {
+                ContentScroller.HorizontalScrollBarVisibility = ScrollBarVisibility.Disabled;
+            }
+
+            if (DataContext is MappingTool mt) {
                 mt.Deactivate();
             }
-            if( view is MappingTool nmt ) {
+            if (view is MappingTool nmt) {
                 nmt.Activate();
             }
 
@@ -339,7 +351,7 @@ private async void LoadBackup(object sender, RoutedEventArgs e) {
         }
 
         private void ViewChanged() {
-            if( !( FindName("ProjectMenu") is MenuItem projectMenu ) )
+            if (FindName("ProjectMenu") is not MenuItem projectMenu)
                 return;
 
             var isSavable = DataContext.GetType().GetInterfaces().Any(x =>
@@ -349,18 +361,18 @@ private void ViewChanged() {
             projectMenu.Visibility = Visibility.Collapsed;
             projectMenu.Items.Clear();
 
-            if( isSavable ) {
+            if (isSavable) {
                 projectMenu.Visibility = Visibility.Visible;
 
                 projectMenu.Items.Add(GetSaveProjectMenuItem());
                 projectMenu.Items.Add(GetLoadProjectMenuItem());
                 projectMenu.Items.Add(GetNewProjectMenuItem());
             }
 
-            if( DataContext is IHaveExtraProjectMenuItems havingExtraProjectMenuItems ) {
+            if (DataContext is IHaveExtraProjectMenuItems havingExtraProjectMenuItems) {
                 projectMenu.Visibility = Visibility.Visible;
 
-                foreach( var menuItem in havingExtraProjectMenuItems.GetMenuItems() ) {
+                foreach (var menuItem in havingExtraProjectMenuItems.GetMenuItems()) {
                     projectMenu.Items.Add(menuItem);
                 }
             }

diff --git a/Mapping_Tools/Views/AutoFailDetector/AutoFailDetectorView.xaml.cs b/Mapping_Tools/Views/AutoFailDetector/AutoFailDetectorView.xaml.cs
@@ -13,6 +13,7 @@
 
 namespace Mapping_Tools.Views.AutoFailDetector {
     [SmartQuickRunUsage(SmartQuickRunTargets.Always)]
+    [VerticalContentScroll]
     public partial class AutoFailDetectorView : IQuickRun {
         private List<double> _unloadingObjects;
         private List<double> _potentialUnloadingObjects;

diff --git a/Mapping_Tools/Views/HitsoundCopier/HitsoundCopierView.xaml.cs b/Mapping_Tools/Views/HitsoundCopier/HitsoundCopierView.xaml.cs
@@ -19,6 +19,7 @@ namespace Mapping_Tools.Views.HitsoundCopier {
     /// <summary>
     /// Interactielogica voor HitsoundCopierView.xaml
     /// </summary>
+    [VerticalContentScroll]
     public partial class HitsoundCopierView : ISavable<HitsoundCopierVm> {
         public static readonly string ToolName = "Hitsound Copier";
 

diff --git a/Mapping_Tools/Views/HorizontalContentScrollAttribute.cs b/Mapping_Tools/Views/HorizontalContentScrollAttribute.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace Mapping_Tools.Views {
+    [AttributeUsage(AttributeTargets.Class)]
+    class HorizontalContentScrollAttribute : Attribute {
+    }
+}
diff --git a/Mapping_Tools/Views/MapCleaner/CleanerView.xaml.cs b/Mapping_Tools/Views/MapCleaner/CleanerView.xaml.cs
@@ -17,6 +17,8 @@
 
 namespace Mapping_Tools.Views.MapCleaner {
     [SmartQuickRunUsage(SmartQuickRunTargets.Always)]
+    [VerticalContentScroll]
+    [HorizontalContentScroll]
     public partial class CleanerView : IQuickRun, ISavable<MapCleanerVm> {
         private List<double> _timingpointsRemoved;
         private List<double> _timingpointsAdded;

diff --git a/Mapping_Tools/Views/Preferences/PreferencesView.xaml.cs b/Mapping_Tools/Views/Preferences/PreferencesView.xaml.cs
@@ -9,6 +9,8 @@ namespace Mapping_Tools.Views.Preferences
     /// <summary>
     /// Interaktionslogik für UserControl2.xaml
     /// </summary>
+    [VerticalContentScroll]
+    [HorizontalContentScroll]
     public partial class PreferencesView {
 
         public static readonly string ToolName = "Preferences";

diff --git a/Mapping_Tools/Views/PropertyTransformer/PropertyTransformerView.xaml.cs b/Mapping_Tools/Views/PropertyTransformer/PropertyTransformerView.xaml.cs
@@ -16,6 +16,8 @@ namespace Mapping_Tools.Views.PropertyTransformer {
     /// <summary>
     /// Interactielogica voor HitsoundCopierView.xaml
     /// </summary>
+    [VerticalContentScroll]
+    [HorizontalContentScroll]
     public partial class PropertyTransformerView : ISavable<PropertyTransformerVm> {
         public static readonly string ToolName = "Property Transformer";
 

diff --git a/Mapping_Tools/Views/RhythmGuide/RhythmGuideView.xaml.cs b/Mapping_Tools/Views/RhythmGuide/RhythmGuideView.xaml.cs
@@ -11,6 +11,7 @@ namespace Mapping_Tools.Views.RhythmGuide {
     /// <summary>
     /// Interactielogica voor RhythmGuideView.xaml
     /// </summary>
+    [VerticalContentScroll]
     public partial class RhythmGuideView : ISavable<RhythmGuideVm> {
         public static readonly string ToolName = "Rhythm Guide";
 

diff --git a/Mapping_Tools/Views/SliderCompletionator/SliderCompletionatorView.xaml.cs b/Mapping_Tools/Views/SliderCompletionator/SliderCompletionatorView.xaml.cs
@@ -19,6 +19,8 @@ namespace Mapping_Tools.Views.SliderCompletionator {
     /// Interaktionslogik für UserControl1.xaml
     /// </summary>
     [SmartQuickRunUsage(SmartQuickRunTargets.AnySelection)]
+    [VerticalContentScroll]
+    [HorizontalContentScroll]
     public partial class SliderCompletionatorView : IQuickRun, ISavable<SliderCompletionatorVm> {
         public event EventHandler RunFinished;
 

diff --git a/Mapping_Tools/Views/SliderMerger/SliderMergerView.xaml.cs b/Mapping_Tools/Views/SliderMerger/SliderMergerView.xaml.cs
@@ -22,6 +22,8 @@ namespace Mapping_Tools.Views.SliderMerger {
     ///     Interaktionslogik für UserControl1.xaml
     /// </summary>
     [SmartQuickRunUsage(SmartQuickRunTargets.MultipleSelection)]
+    [VerticalContentScroll]
+    [HorizontalContentScroll]
     public partial class SliderMergerView : IQuickRun, ISavable<SliderMergerVm> {
         public static readonly string ToolName = "Slider Merger";
 

diff --git a/Mapping_Tools/Views/SnappingTools/SnappingToolsView.xaml.cs b/Mapping_Tools/Views/SnappingTools/SnappingToolsView.xaml.cs
@@ -12,10 +12,8 @@
 using Mapping_Tools.Viewmodels;
 using MaterialDesignThemes.Wpf;
 
-namespace Mapping_Tools.Views.SnappingTools
-{
-    public partial class SnappingToolsView : ISavable<SnappingToolsProject>, IHaveExtraProjectMenuItems
-    {
+namespace Mapping_Tools.Views.SnappingTools {
+    public partial class SnappingToolsView : ISavable<SnappingToolsProject>, IHaveExtraProjectMenuItems {
 
         public static readonly string ToolName = "Geometry Dashboard";
 

diff --git a/Mapping_Tools/Views/TimingCopier/TimingCopierView.xaml.cs b/Mapping_Tools/Views/TimingCopier/TimingCopierView.xaml.cs
@@ -16,6 +16,7 @@ namespace Mapping_Tools.Views.TimingCopier {
     /// <summary>
     /// Interactielogica voor TimingCopierView.xaml
     /// </summary>
+    [VerticalContentScroll]
     public partial class TimingCopierView : ISavable<TimingCopierVm> {
         public string AutoSavePath => Path.Combine(MainWindow.AppDataPath, "timingcopierproject.json");
 

diff --git a/Mapping_Tools/Views/TimingHelper/TimingHelperView.xaml.cs b/Mapping_Tools/Views/TimingHelper/TimingHelperView.xaml.cs
@@ -20,6 +20,8 @@ namespace Mapping_Tools.Views.TimingHelper {
     /// Interactielogica voor TimingHelperView.xaml
     /// </summary>
     [SmartQuickRunUsage(SmartQuickRunTargets.Always)]
+    [VerticalContentScroll]
+    [HorizontalContentScroll]
     public partial class TimingHelperView : IQuickRun, ISavable<TimingHelperVm> {
         public static readonly string ToolName = "Timing Helper";
 

diff --git a/Mapping_Tools/Views/VerticalContentScrollAttribute.cs b/Mapping_Tools/Views/VerticalContentScrollAttribute.cs
@@ -0,0 +1,7 @@
+using System;
+
+namespace Mapping_Tools.Views {
+    [AttributeUsage(AttributeTargets.Class)]
+    class VerticalContentScrollAttribute : Attribute {
+    }
+}