From b40a88c4d35be7150fde9a5c00ec3b8074117248 Mon Sep 17 00:00:00 2001
From: Tyrrrz <1935960+Tyrrrz@users.noreply.github.com>
Date: Wed, 15 Dec 2021 16:13:48 +0200
Subject: [PATCH] Add border to settings view too

---
 .../Views/Dialogs/MessageBoxView.xaml         |   2 +-
 .../Views/Dialogs/SettingsView.xaml           | 233 +++++++++---------
 2 files changed, 119 insertions(+), 116 deletions(-)

diff --git a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.xaml
index a4845ecb..a0ee348c 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/MessageBoxView.xaml
@@ -35,7 +35,7 @@
             BorderThickness="0,1">
             <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
                 <TextBlock
-                    Margin="16,0,16,16"
+                    Margin="16"
                     Text="{Binding Message}"
                     TextWrapping="Wrap" />
             </ScrollViewer>
diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
index 6520b19e..1609ce33 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
@@ -24,126 +24,129 @@
             FontWeight="Light"
             Text="Settings" />
 
-        <ScrollViewer
+        <Border
             Grid.Row="1"
-            HorizontalScrollBarVisibility="Disabled"
-            VerticalScrollBarVisibility="Auto">
-            <StackPanel>
-                <!--  Auto-updates  -->
-                <DockPanel
-                    Margin="16,8"
-                    Background="Transparent"
-                    LastChildFill="False"
-                    ToolTip="Perform automatic updates on every launch">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Text="Auto-updates" />
-                    <ToggleButton
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Right"
-                        IsChecked="{Binding IsAutoUpdateEnabled}" />
-                </DockPanel>
-
-                <!--  Dark mode  -->
-                <DockPanel
-                    Margin="16,8"
-                    Background="Transparent"
-                    LastChildFill="False"
-                    ToolTip="Use darker colors in the UI">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Text="Dark mode" />
-                    <ToggleButton
-                        x:Name="DarkModeToggleButton"
-                        VerticalAlignment="Center"
-                        Checked="DarkModeToggleButton_Checked"
-                        DockPanel.Dock="Right"
-                        IsChecked="{Binding IsDarkModeEnabled}"
-                        Unchecked="DarkModeToggleButton_Unchecked" />
-                </DockPanel>
-
-                <!--  Persist token  -->
-                <DockPanel
-                    Margin="16,8"
-                    Background="Transparent"
-                    LastChildFill="False"
-                    ToolTip="Save last used token in a file so that it can be persisted between sessions">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Text="Save token" />
-                    <ToggleButton
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Right"
-                        IsChecked="{Binding IsTokenPersisted}" />
-                </DockPanel>
-
-                <!--  Reuse media  -->
-                <DockPanel
-                    Margin="16,8"
-                    Background="Transparent"
-                    LastChildFill="False"
-                    ToolTip="Reuse already existing media content to skip redundant downloads">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Text="Reuse downloaded media" />
-                    <ToggleButton
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Right"
-                        IsChecked="{Binding ShouldReuseMedia}" />
-                </DockPanel>
-
-                <!--  Date format  -->
-                <DockPanel
-                    Margin="16,8"
-                    Background="Transparent"
-                    LastChildFill="False"
-                    ToolTip="Format used when writing dates (uses .NET date formatting rules)">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Text="Date format" />
-                    <TextBox
-                        Width="150"
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Right"
-                        Text="{Binding DateFormat}" />
-                </DockPanel>
-
-                <!--  Parallel limit  -->
-                <DockPanel
-                    Margin="16,8"
-                    Background="Transparent"
-                    LastChildFill="False"
-                    ToolTip="How many channels can be exported at the same time">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Left"
-                        Text="Parallel limit"
-                        TextAlignment="Right" />
-                    <StackPanel
-                        VerticalAlignment="Center"
-                        DockPanel.Dock="Right"
-                        Orientation="Horizontal">
+            Padding="0,8"
+            BorderBrush="{DynamicResource MaterialDesignDivider}"
+            BorderThickness="0,1">
+            <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                <StackPanel>
+                    <!--  Auto-updates  -->
+                    <DockPanel
+                        Margin="16,8"
+                        Background="Transparent"
+                        LastChildFill="False"
+                        ToolTip="Perform automatic updates on every launch">
                         <TextBlock
-                            Margin="10,0"
                             VerticalAlignment="Center"
-                            FontWeight="SemiBold"
-                            Text="{Binding ParallelLimit}" />
-                        <Slider
+                            DockPanel.Dock="Left"
+                            Text="Auto-updates" />
+                        <ToggleButton
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            IsChecked="{Binding IsAutoUpdateEnabled}" />
+                    </DockPanel>
+
+                    <!--  Dark mode  -->
+                    <DockPanel
+                        Margin="16,8"
+                        Background="Transparent"
+                        LastChildFill="False"
+                        ToolTip="Use darker colors in the UI">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Left"
+                            Text="Dark mode" />
+                        <ToggleButton
+                            x:Name="DarkModeToggleButton"
+                            VerticalAlignment="Center"
+                            Checked="DarkModeToggleButton_Checked"
+                            DockPanel.Dock="Right"
+                            IsChecked="{Binding IsDarkModeEnabled}"
+                            Unchecked="DarkModeToggleButton_Unchecked" />
+                    </DockPanel>
+
+                    <!--  Persist token  -->
+                    <DockPanel
+                        Margin="16,8"
+                        Background="Transparent"
+                        LastChildFill="False"
+                        ToolTip="Save last used token in a file so that it can be persisted between sessions">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Left"
+                            Text="Save token" />
+                        <ToggleButton
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            IsChecked="{Binding IsTokenPersisted}" />
+                    </DockPanel>
+
+                    <!--  Reuse media  -->
+                    <DockPanel
+                        Margin="16,8"
+                        Background="Transparent"
+                        LastChildFill="False"
+                        ToolTip="Reuse already existing media content to skip redundant downloads">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Left"
+                            Text="Reuse downloaded media" />
+                        <ToggleButton
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            IsChecked="{Binding ShouldReuseMedia}" />
+                    </DockPanel>
+
+                    <!--  Date format  -->
+                    <DockPanel
+                        Margin="16,8"
+                        Background="Transparent"
+                        LastChildFill="False"
+                        ToolTip="Format used when writing dates (uses .NET date formatting rules)">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Left"
+                            Text="Date format" />
+                        <TextBox
                             Width="150"
                             VerticalAlignment="Center"
-                            Maximum="10"
-                            Minimum="1"
-                            Style="{DynamicResource MaterialDesignThinSlider}"
-                            Value="{Binding ParallelLimit}" />
-                    </StackPanel>
-                </DockPanel>
-            </StackPanel>
-        </ScrollViewer>
+                            DockPanel.Dock="Right"
+                            Text="{Binding DateFormat}" />
+                    </DockPanel>
+
+                    <!--  Parallel limit  -->
+                    <DockPanel
+                        Margin="16,8"
+                        Background="Transparent"
+                        LastChildFill="False"
+                        ToolTip="How many channels can be exported at the same time">
+                        <TextBlock
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Left"
+                            Text="Parallel limit"
+                            TextAlignment="Right" />
+                        <StackPanel
+                            VerticalAlignment="Center"
+                            DockPanel.Dock="Right"
+                            Orientation="Horizontal">
+                            <TextBlock
+                                Margin="10,0"
+                                VerticalAlignment="Center"
+                                FontWeight="SemiBold"
+                                Text="{Binding ParallelLimit}" />
+                            <Slider
+                                Width="150"
+                                VerticalAlignment="Center"
+                                Maximum="10"
+                                Minimum="1"
+                                Style="{DynamicResource MaterialDesignThinSlider}"
+                                Value="{Binding ParallelLimit}" />
+                        </StackPanel>
+                    </DockPanel>
+                </StackPanel>
+            </ScrollViewer>
+        </Border>
 
         <!--  Save button  -->
         <Button