Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Source/NETworkManager/Resources/Styles/ScrollViewerStyles.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" />
Expand All @@ -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"
Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions Website/docs/changelog/next-release.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down