tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2118 from Gillibald/fixes/RedundantTabControlScrollViewer 

TabControl: Remove redundant scrollviewer from default control template
pull/2123/head
Steven Kirk 8 years ago
committed by GitHub
parent
c0b4327d30 b84069b27f
commit
bc9e990ae7
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 41
      src/Avalonia.Themes.Default/TabControl.xaml

41
src/Avalonia.Themes.Default/TabControl.xaml
View File

@ -3,8 +3,6 @@
<Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/> <Setter Property="Background" Value="{DynamicResource ThemeBackgroundBrush}"/>
<Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/> <Setter Property="BorderBrush" Value="{DynamicResource ThemeBorderMidBrush}"/>
<Setter Property="Padding" Value="4"/> <Setter Property="Padding" Value="4"/>
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
<Setter Property="VerticalContentAlignment" Value="Stretch"/> <Setter Property="VerticalContentAlignment" Value="Stretch"/>
<Setter Property="HorizontalContentAlignment" Value="Stretch"/> <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="Template"> <Setter Property="Template">
@ -16,28 +14,23 @@
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"
HorizontalAlignment="{TemplateBinding HorizontalAlignment}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
VerticalAlignment="{TemplateBinding VerticalAlignment}"> VerticalAlignment="{TemplateBinding VerticalAlignment}">
<ScrollViewer <DockPanel>
Name="PART_ScrollViewer" <ItemsPresenter
HorizontalScrollBarVisibility="{TemplateBinding (ScrollViewer.HorizontalScrollBarVisibility)}" Name="PART_ItemsPresenter"
VerticalScrollBarVisibility="{TemplateBinding (ScrollViewer.VerticalScrollBarVisibility)}"> Items="{TemplateBinding Items}"
<DockPanel> ItemsPanel="{TemplateBinding ItemsPanel}"
<ItemsPresenter ItemTemplate="{TemplateBinding ItemTemplate}"
Name="PART_ItemsPresenter" MemberSelector="{TemplateBinding MemberSelector}" >
Items="{TemplateBinding Items}" </ItemsPresenter>
ItemsPanel="{TemplateBinding ItemsPanel}" <ContentPresenter
ItemTemplate="{TemplateBinding ItemTemplate}" Name="PART_Content"
MemberSelector="{TemplateBinding MemberSelector}" > Margin="{TemplateBinding Padding}"
</ItemsPresenter> HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
<ContentPresenter VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Name="PART_Content" Content="{TemplateBinding SelectedContent}"
Margin="{TemplateBinding Padding}" ContentTemplate="{TemplateBinding SelectedContentTemplate}">
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" </ContentPresenter>
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" </DockPanel>
Content="{TemplateBinding SelectedContent}"
ContentTemplate="{TemplateBinding SelectedContentTemplate}">
</ContentPresenter>
</DockPanel>
</ScrollViewer>
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

Write Preview
Loading…
Cancel
Save