removed scrollviewer

digitalize-ltd · Feb 13, 2024 · 366d5ff · 366d5ff
1 parent 48256c4
commit 366d5ff
Show file tree

Hide file tree

Showing 2 changed files with 98 additions and 112 deletions.
diff --git a/DigitalizeApp/Core/Views/MainView.axaml b/DigitalizeApp/Core/Views/MainView.axaml
@@ -15,56 +15,49 @@
  <vm:MainViewModel />
  </Design.DataContext>
 
- <ScrollViewer
- Padding="20"
- HorizontalScrollBarVisibility="Auto"
- VerticalScrollBarVisibility="Auto">
-
- <!-- no border -->
- <Border Name="noBorder">
-
- <!-- control layout grid -->
- <Grid
+ <!-- no border -->
+ <Border Name="noBorder">
+
+ <!-- control layout grid -->
+ <Grid
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ RowDefinitions="Auto, Auto">
+
+ <!-- content -->
+ <ContentControl
+ Grid.Row="0"
+ MaxWidth="340"
  HorizontalAlignment="Center"
  VerticalAlignment="Center"
- RowDefinitions="Auto, Auto">
-
- <!-- content -->
- <ContentControl
- Grid.Row="0"
- MaxWidth="340"
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
- Content="{Binding Content}" />
-
- <StackPanel Grid.Row="1" IsVisible="{Binding HomeButtonVisible}">
-
- <!-- separator -->
- <Border
- Grid.Row="1"
- Height="2"
- Margin="0,20"
- Background="#FB8B24"
- BorderThickness="0" />
-
- <!-- app title bar -->
- <Button
- Grid.Row="1"
- HorizontalAlignment="Right"
- Command="{Binding GoHomeCommand}"
- Theme="{StaticResource AppControlButton}"
- ToolTip.Tip="Home">
- <Image
- Width="30"
- Height="30"
- Source="/Assets/Images/home.png" />
- </Button>
- </StackPanel>
-
- </Grid>
-
- </Border>
-
- </ScrollViewer>
+ Content="{Binding Content}" />
+
+ <StackPanel Grid.Row="1" IsVisible="{Binding HomeButtonVisible}">
+
+ <!-- separator -->
+ <Border
+ Grid.Row="1"
+ Height="2"
+ Margin="0,20"
+ Background="#FB8B24"
+ BorderThickness="0" />
+
+ <!-- app title bar -->
+ <Button
+ Grid.Row="1"
+ HorizontalAlignment="Right"
+ Command="{Binding GoHomeCommand}"
+ Theme="{StaticResource AppControlButton}"
+ ToolTip.Tip="Home">
+ <Image
+ Width="30"
+ Height="30"
+ Source="/Assets/Images/home.png" />
+ </Button>
+ </StackPanel>
+
+ </Grid>
+
+ </Border>
 
 </UserControl>
diff --git a/DigitalizeApp/Core/Views/Shell.axaml b/DigitalizeApp/Core/Views/Shell.axaml
@@ -19,78 +19,71 @@
  <vm:MainViewModel />
  </Design.DataContext>
 
- <ScrollViewer
- Padding="20"
- HorizontalScrollBarVisibility="Auto"
- VerticalScrollBarVisibility="Auto">
-
- <!-- no border -->
- <Border Name="noBorder">
-
- <!-- control layout grid -->
- <Grid
+ <!-- no border -->
+ <Border Name="noBorder">
+
+ <!-- control layout grid -->
+ <Grid
+ HorizontalAlignment="Center"
+ VerticalAlignment="Center"
+ RowDefinitions="Auto, Auto">
+
+ <!-- content -->
+ <ContentControl
+ Grid.Row="0"
+ MinWidth="200"
+ MaxWidth="800"
  HorizontalAlignment="Center"
  VerticalAlignment="Center"
- RowDefinitions="Auto, Auto">
-
- <!-- content -->
- <ContentControl
- Grid.Row="0"
- MinWidth="200"
- MaxWidth="800"
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
- Content="{Binding Content}" />
-
- <StackPanel Grid.Row="1" IsVisible="{Binding HomeButtonVisible}">
+ Content="{Binding Content}" />
+
+ <StackPanel Grid.Row="1" IsVisible="{Binding HomeButtonVisible}">
+
+ <!-- separator -->
+ <Border
+ Grid.Row="1"
+ Height="2"
+ Margin="0,20"
+ Background="#FB8B24"
+ BorderThickness="0" />
+
+ <WrapPanel
+ Margin="0,0"
+ HorizontalAlignment="Right"
+ Orientation="Horizontal">
+
+ <!-- app title bar -->
+ <Button
+ Command="{Binding GoHomeCommand}"
+ Theme="{StaticResource AppControlButton}"
+ ToolTip.Tip="Home">
+ <Image
+ Width="30"
+ Height="30"
+ Source="/Assets/Images/home.png" />
+ </Button>
 
- <!-- separator -->
  <Border
- Grid.Row="1"
- Height="2"
- Margin="0,20"
- Background="#FB8B24"
+ Width="3"
+ Margin="20,0"
+ Background="#9A031E"
  BorderThickness="0" />
 
- <WrapPanel
- Margin="0,0"
- HorizontalAlignment="Right"
- Orientation="Horizontal">
-
- <!-- app title bar -->
- <Button
- Command="{Binding GoHomeCommand}"
- Theme="{StaticResource AppControlButton}"
- ToolTip.Tip="Home">
- <Image
- Width="30"
- Height="30"
- Source="/Assets/Images/home.png" />
- </Button>
-
- <Border
- Width="3"
- Margin="20,0"
- Background="#9A031E"
- BorderThickness="0" />
-
- <!-- close window -->
- <Button Theme="{StaticResource AppControlButton}" ToolTip.Tip="Exit">
- <Image
- Width="30"
- Height="30"
- PointerPressed="Window_ExitPressed"
- Source="/Assets/Images/exit.png" />
- </Button>
-
- </WrapPanel>
+ <!-- close window -->
+ <Button Theme="{StaticResource AppControlButton}" ToolTip.Tip="Exit">
+ <Image
+ Width="30"
+ Height="30"
+ PointerPressed="Window_ExitPressed"
+ Source="/Assets/Images/exit.png" />
+ </Button>
 
- </StackPanel>
+ </WrapPanel>
 
- </Grid>
+ </StackPanel>
 
- </Border>
+ </Grid>
 
- </ScrollViewer>
+ </Border>
 
 </Window>