From 8ffccd6a7399c9e6a955128861a20207a139ac2c Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Wed, 19 Jun 2024 20:59:38 +0200
Subject: [PATCH 1/2] Fix: TextBox content not centered because of scrollviewer

---
 .../Resources/Styles/ScrollViewerStyles.xaml     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Source/NETworkManager/Resources/Styles/ScrollViewerStyles.xaml b/Source/NETworkManager/Resources/Styles/ScrollViewerStyles.xaml
index 88cc5010bb..89b45137be 100644
--- a/Source/NETworkManager/Resources/Styles/ScrollViewerStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/ScrollViewerStyles.xaml
@@ -17,7 +17,11 @@
                             <RowDefinition Height="*" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <ScrollContentPresenter Grid.ColumnSpan="1" Grid.RowSpan="1" />
+                        <ScrollContentPresenter Grid.ColumnSpan="1" Grid.RowSpan="1"
+                                                Margin="{TemplateBinding Control.Padding}"
+                                                Content="{TemplateBinding ContentControl.Content}"
+                                                ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                                CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}" />
                         <ScrollBar Name="PART_VerticalScrollBar"
                                    HorizontalAlignment="Right"
                                    Grid.Row="0"
@@ -43,7 +47,7 @@
     </Style>
 
     <Style TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource DefaultScrollViewer}" />
-    
+
     <Style x:Key="FadeOutScrollViewer" TargetType="{x:Type ScrollViewer}"
            BasedOn="{StaticResource MahApps.Styles.ScrollViewer}">
         <Setter Property="VerticalScrollBarVisibility" Value="Hidden" />
@@ -61,7 +65,11 @@
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <ScrollContentPresenter Grid.Column="0" Grid.Row="0"
-                                                Grid.ColumnSpan="2" Grid.RowSpan="2" />
+                                                Grid.ColumnSpan="2" Grid.RowSpan="2"
+                                                Margin="{TemplateBinding Control.Padding}"
+                                                Content="{TemplateBinding ContentControl.Content}"
+                                                ContentTemplate="{TemplateBinding ContentControl.ContentTemplate}"
+                                                CanContentScroll="{TemplateBinding ScrollViewer.CanContentScroll}" />
                         <ScrollBar Name="PART_VerticalScrollBar"
                                    HorizontalAlignment="Right"
                                    Grid.Row="0"
@@ -77,7 +85,7 @@
                                    Maximum="{TemplateBinding Property=ScrollableWidth}"
                                    ViewportSize="{TemplateBinding Property=ViewportWidth}"
                                    Orientation="Horizontal"
-                                   Visibility="{TemplateBinding Property=ComputedHorizontalScrollBarVisibility}"/>
+                                   Visibility="{TemplateBinding Property=ComputedHorizontalScrollBarVisibility}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

From 8ee652585233caa694fe4f2fc462bd7461680ead Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Wed, 19 Jun 2024 21:01:43 +0200
Subject: [PATCH 2/2] Docs: #2763

---
 Website/docs/changelog/next-release.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index e3d9fab888..0648a67320 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -23,6 +23,8 @@ Release date: **xx.xx.2024**
 
 ## Bugfixes
 
+- TextBox content not centered because of ScrollViewer issue. [#2763](https://github.com/BornToBeRoot/NETworkManager/pull/2763)
+
 ## Dependencies, Refactoring & Documentation
 
 - Code cleanup & refactoring