Browse Source

Bind to correct property.

pull/504/head
Steven Kirk 11 years ago
parent
commit
2feca0b691
  1. 2
      src/Perspex.Themes.Default/DropDown.xaml
  2. 6
      src/Perspex.Themes.Default/MenuItem.xaml
  3. 2
      src/Perspex.Themes.Default/TreeViewItem.xaml

2
src/Perspex.Themes.Default/DropDown.xaml

@ -11,7 +11,7 @@
BorderThickness="{TemplateBinding BorderThickness}"> BorderThickness="{TemplateBinding BorderThickness}">
<Grid ColumnDefinitions="*,Auto"> <Grid ColumnDefinitions="*,Auto">
<ContentPresenter Content="{TemplateBinding SelectionBoxItem}" <ContentPresenter Content="{TemplateBinding SelectionBoxItem}"
DataContext="{TemplateBinding Content}" DataContext="{TemplateBinding SelectionBoxItem}"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>

6
src/Perspex.Themes.Default/MenuItem.xaml

@ -13,7 +13,7 @@
<Grid ColumnDefinitions="22,13,*,20"> <Grid ColumnDefinitions="22,13,*,20">
<ContentPresenter Name="icon" <ContentPresenter Name="icon"
Content="{TemplateBinding Icon}" Content="{TemplateBinding Icon}"
DataContext="{TemplateBinding Content}" DataContext="{TemplateBinding Icon}"
Width="16" Width="16"
Height="16" Height="16"
Margin="3" Margin="3"
@ -27,7 +27,7 @@
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<ContentPresenter Name="PART_HeaderPresenter" <ContentPresenter Name="PART_HeaderPresenter"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
DataContext="{TemplateBinding Content}" DataContext="{TemplateBinding Header}"
Margin="{TemplateBinding Padding}" Margin="{TemplateBinding Padding}"
VerticalAlignment="Center" VerticalAlignment="Center"
Grid.Column="2"> Grid.Column="2">
@ -83,7 +83,7 @@
<Panel> <Panel>
<ContentPresenter Name="PART_HeaderPresenter" <ContentPresenter Name="PART_HeaderPresenter"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
DataContext="{TemplateBinding Content}" DataContext="{TemplateBinding Header}"
Margin="{TemplateBinding Padding}"> Margin="{TemplateBinding Padding}">
<ContentPresenter.DataTemplates> <ContentPresenter.DataTemplates>
<DataTemplate DataType="sys:String"> <DataTemplate DataType="sys:String">

2
src/Perspex.Themes.Default/TreeViewItem.xaml

@ -13,7 +13,7 @@
BorderBrush="{TemplateBinding BorderBrush}" BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
DataContext="{TemplateBinding Content}" DataContext="{TemplateBinding Header}"
Padding="{TemplateBinding Padding}" Padding="{TemplateBinding Padding}"
TemplatedControl.IsTemplateFocusTarget="True" TemplatedControl.IsTemplateFocusTarget="True"
Grid.Column="1"/> Grid.Column="1"/>

Loading…
Cancel
Save