Skip to content

Commit b5b627c

Browse files
committed
generalizing AdornerDecorator
1 parent 9c5e083 commit b5b627c

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

source/iNKORE.UI.WPF.Modern/Themes/Controls/ScrollViewer.xaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,17 @@
199199
Grid.Column="0"
200200
Grid.ColumnSpan="2"
201201
Padding="{TemplateBinding Padding}">
202-
<ScrollContentPresenter
203-
x:Name="PART_ScrollContentPresenter"
204-
Margin="{TemplateBinding chelper:TextControlContentHostHelper.ContentPresenterMargin}"
205-
CanContentScroll="{TemplateBinding CanContentScroll}"
206-
CanHorizontallyScroll="False"
207-
CanVerticallyScroll="False"
208-
Content="{TemplateBinding Content}"
209-
ContentTemplate="{TemplateBinding ContentTemplate}" />
202+
203+
<AdornerDecorator>
204+
<ScrollContentPresenter
205+
x:Name="PART_ScrollContentPresenter"
206+
Margin="{TemplateBinding chelper:TextControlContentHostHelper.ContentPresenterMargin}"
207+
CanContentScroll="{TemplateBinding CanContentScroll}"
208+
CanHorizontallyScroll="False"
209+
CanVerticallyScroll="False"
210+
Content="{TemplateBinding Content}"
211+
ContentTemplate="{TemplateBinding ContentTemplate}" />
212+
</AdornerDecorator>
210213
</Border>
211214
<ScrollBar
212215
x:Name="PART_VerticalScrollBar"
@@ -238,10 +241,12 @@
238241

239242
<ControlTemplate x:Key="ScrollViewerScrollBarlessTemplate" TargetType="ScrollViewer">
240243
<Grid Background="{TemplateBinding Background}">
241-
<ScrollContentPresenter
244+
<AdornerDecorator>
245+
<ScrollContentPresenter
242246
x:Name="ScrollContentPresenter"
243247
Margin="{TemplateBinding Padding}"
244248
ContentTemplate="{TemplateBinding ContentTemplate}" />
249+
</AdornerDecorator>
245250
</Grid>
246251
</ControlTemplate>
247252

0 commit comments

Comments
 (0)