Adjust DataGridColumnHeader Height + CornerRadius of ToggleButtons

affederaffe · Dec 11, 2022 · 3bdedb3 · 3bdedb3
1 parent 91847ca
commit 3bdedb3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/BeatSaberModManager/Resources/Styles/HamburgerMenu.axaml b/BeatSaberModManager/Resources/Styles/HamburgerMenu.axaml
@@ -203,11 +203,11 @@
                                       Width="{StaticResource PaneCompactWidth}"
                                       Height="{StaticResource HamburgerMenuButtonHeight}"
                                       Padding="0"
+                                      CornerRadius="0"
                                       HorizontalAlignment="Left"
                                       VerticalAlignment="Top"
                                       HorizontalContentAlignment="Center"
                                       Theme="{StaticResource NavigationButton}"
-                                      CornerRadius="4"
                                       IsChecked="{Binding #PART_NavigationPane.IsPaneOpen, Mode=TwoWay}">
                             <PathIcon Data="{DynamicResource Icons:HamburgerMenu}" Foreground="{TemplateBinding Foreground}" />
                         </ToggleButton>

diff --git a/BeatSaberModManager/Resources/Styles/SearchableDataGrid.axaml b/BeatSaberModManager/Resources/Styles/SearchableDataGrid.axaml
@@ -11,7 +11,7 @@
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
-                    <Grid ColumnDefinitions="*, Auto" RowDefinitions="Auto, Auto, *, Auto, Auto">
+                    <Grid ColumnDefinitions="*, Auto" RowDefinitions="30, Auto, *, Auto, Auto">
                         <DataGridColumnHeadersPresenter Name="PART_ColumnHeadersPresenter"
                                                         Grid.Column="0"
                                                         Grid.Row="0" Grid.ColumnSpan="2">
@@ -23,6 +23,7 @@
                                       HorizontalAlignment="Right"
                                       Background="Transparent"
                                       BorderBrush="{x:Null}"
+                                      CornerRadius="0"
                                       IsChecked="{TemplateBinding IsSearchEnabled, Mode=TwoWay}"
                                       Content="{TemplateBinding SearchIcon}">
                         </ToggleButton>

diff --git a/BeatSaberModManager/Views/Windows/MainWindow.axaml b/BeatSaberModManager/Views/Windows/MainWindow.axaml
@@ -15,14 +15,13 @@
         Icon="/Resources/Icons/Icon.ico"
         Background="Transparent"
         MinWidth="820" MinHeight="350"
-        Width="1100" Height="600"
-        Margin="{Binding #Window.OffScreenMargin}">
+        Width="1100" Height="600">
 
     <Window.Resources>
         <cv:LocalizedStatusConverter x:Key="LocalizedStatusConverter" />
     </Window.Resources>
 
-    <c:HamburgerMenu x:Name="HamburgerMenu">
+    <c:HamburgerMenu x:Name="HamburgerMenu" Margin="{Binding #Window.OffScreenMargin}">
         <TabItem>
             <p:IntroPage />
             <TabItem.Header>