Revert "Binding ContentPresenter's DataContext."

This reverts commit 4241fd8331.
10 years ago · 6eebe89a1b
15 changed files with 2 additions and 24 deletions
--- a/src/Perspex.Themes.Default/Button.xaml
+++ b/src/Perspex.Themes.Default/Button.xaml
@ -14,7 +14,6 @@
                          BorderBrush="{TemplateBinding BorderBrush}"
                          BorderThickness="{TemplateBinding BorderThickness}"
                          Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                          Padding="{TemplateBinding Padding}"
                          TextBlock.Foreground="{TemplateBinding Foreground}"
                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
--- a/src/Perspex.Themes.Default/CheckBox.xaml
+++ b/src/Perspex.Themes.Default/CheckBox.xaml
@ -22,7 +22,6 @@
          </Border>
          <ContentPresenter Name="PART_ContentPresenter"
                            Content="{TemplateBinding Content}"
-                            DataContext="{TemplateBinding Content}" 
                            Margin="4,0,0,0"
                            VerticalAlignment="Center"
                            Grid.Column="1"/>
--- a/src/Perspex.Themes.Default/ContentControl.xaml
+++ b/src/Perspex.Themes.Default/ContentControl.xaml
@ -5,8 +5,7 @@
                        Background="{TemplateBinding Background}"
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
-                        Content="{TemplateBinding Content}"
-                        DataContext="{TemplateBinding Content}" 
+                        Content="{TemplateBinding Content}" 
                        Padding="{TemplateBinding Padding}"/>
    </ControlTemplate>
  </Setter>
--- a/src/Perspex.Themes.Default/DropDown.xaml
+++ b/src/Perspex.Themes.Default/DropDown.xaml
@ -11,7 +11,6 @@
                BorderThickness="{TemplateBinding BorderThickness}">
          <Grid ColumnDefinitions="*,Auto">
            <ContentPresenter Content="{TemplateBinding SelectionBoxItem}"
-                              DataContext="{TemplateBinding SelectionBoxItem}" 
                              Margin="{TemplateBinding Padding}"
                              HorizontalAlignment="Center"
                              VerticalAlignment="Center"/>
--- a/src/Perspex.Themes.Default/DropDownItem.xaml
+++ b/src/Perspex.Themes.Default/DropDownItem.xaml
@ -10,7 +10,6 @@
                          BorderBrush="{TemplateBinding BorderBrush}"
                          BorderThickness="{TemplateBinding BorderThickness}"
                          Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                          Padding="{TemplateBinding Padding}"/>
--- a/src/Perspex.Themes.Default/Expander.xaml
+++ b/src/Perspex.Themes.Default/Expander.xaml
@ -17,7 +17,6 @@
                              Grid.Row="1"
                              IsVisible="{TemplateBinding IsExpanded}"
                              Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                              HorizontalAlignment="Stretch"
                              VerticalAlignment="Stretch" />
          </Grid>
@ -35,7 +34,6 @@
                              Grid.Row="0"
                              IsVisible="{TemplateBinding IsExpanded}"
                              Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                              HorizontalAlignment="Stretch"
                              VerticalAlignment="Stretch" />
          </Grid>
@ -53,7 +51,6 @@
                              Grid.Column="1"
                              IsVisible="{TemplateBinding IsExpanded}"
                              Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                              HorizontalAlignment="Stretch"
                              VerticalAlignment="Stretch" />
          </Grid>
@ -71,7 +68,6 @@
                              Grid.Column="0"
                              IsVisible="{TemplateBinding IsExpanded}"
                              Content="{TemplateBinding Content}"
-                              DataContext="{TemplateBinding Content}" 
                              HorizontalAlignment="Stretch"
                              VerticalAlignment="Stretch" />
          </Grid>
--- a/src/Perspex.Themes.Default/LayoutTransformControl.xaml
+++ b/src/Perspex.Themes.Default/LayoutTransformControl.xaml
@ -6,7 +6,6 @@
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
                        Content="{TemplateBinding Content}" 
-                        DataContext="{TemplateBinding Content}" 
                        Padding="{TemplateBinding Padding}"/>
    </ControlTemplate>
  </Setter>
--- a/src/Perspex.Themes.Default/ListBoxItem.xaml
+++ b/src/Perspex.Themes.Default/ListBoxItem.xaml
@ -7,7 +7,6 @@
                          BorderBrush="{TemplateBinding BorderBrush}"
                          BorderThickness="{TemplateBinding BorderThickness}"
                          Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                          Padding="{TemplateBinding Padding}"/>
      </ControlTemplate>
    </Setter>
--- a/src/Perspex.Themes.Default/MenuItem.xaml
+++ b/src/Perspex.Themes.Default/MenuItem.xaml
@ -13,7 +13,6 @@
          <Grid ColumnDefinitions="22,13,*,20">
            <ContentPresenter Name="icon"
                              Content="{TemplateBinding Icon}"
-                              DataContext="{TemplateBinding Icon}" 
                              Width="16"
                              Height="16"
                              Margin="3"
@ -27,7 +26,6 @@
                  VerticalAlignment="Center"/>
            <ContentPresenter Name="PART_HeaderPresenter"
                              Content="{TemplateBinding Header}"
-                              DataContext="{TemplateBinding Header}" 
                              Margin="{TemplateBinding Padding}"
                              VerticalAlignment="Center"
                              Grid.Column="2">
@ -83,7 +81,6 @@
          <Panel>
            <ContentPresenter Name="PART_HeaderPresenter"
                              Content="{TemplateBinding Header}"
-                              DataContext="{TemplateBinding Header}" 
                              Margin="{TemplateBinding Padding}">
              <ContentPresenter.DataTemplates>
                <DataTemplate DataType="sys:String">
--- a/src/Perspex.Themes.Default/RadioButton.xaml
+++ b/src/Perspex.Themes.Default/RadioButton.xaml
@ -21,7 +21,6 @@
                   VerticalAlignment="Center"/>
          <ContentPresenter Name="PART_ContentPresenter"
                            Content="{TemplateBinding Content}"
-                            DataContext="{TemplateBinding Content}" 
                            Margin="4,0,0,0"
                            VerticalAlignment="Center"
                            Grid.Column="1"/>
--- a/src/Perspex.Themes.Default/TabStripItem.xaml
+++ b/src/Perspex.Themes.Default/TabStripItem.xaml
@ -9,7 +9,6 @@
                          BorderBrush="{TemplateBinding BorderBrush}"
                          BorderThickness="{TemplateBinding BorderThickness}"
                          Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                          Padding="{TemplateBinding Padding}"/>
      </ControlTemplate>
    </Setter>
--- a/src/Perspex.Themes.Default/ToggleButton.xaml
+++ b/src/Perspex.Themes.Default/ToggleButton.xaml
@ -14,7 +14,6 @@
                          BorderBrush="{TemplateBinding BorderBrush}"
                          BorderThickness="{TemplateBinding BorderThickness}"
                          Content="{TemplateBinding Content}"
-                          DataContext="{TemplateBinding Content}" 
                          Padding="{TemplateBinding Padding}"
                          TextBlock.Foreground="{TemplateBinding Foreground}"
                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
--- a/src/Perspex.Themes.Default/ToolTip.xaml
+++ b/src/Perspex.Themes.Default/ToolTip.xaml
@ -10,7 +10,6 @@
                        BorderBrush="{TemplateBinding BorderBrush}"
                        BorderThickness="{TemplateBinding BorderThickness}"
                        Content="{TemplateBinding Content}" 
-                        DataContext="{TemplateBinding Content}" 
                        Padding="{TemplateBinding Padding}"/>
    </ControlTemplate>
  </Setter>
--- a/src/Perspex.Themes.Default/TreeViewItem.xaml
+++ b/src/Perspex.Themes.Default/TreeViewItem.xaml
@ -13,7 +13,6 @@
                              BorderBrush="{TemplateBinding BorderBrush}"
                              BorderThickness="{TemplateBinding BorderThickness}"
                              Content="{TemplateBinding Header}"
-                              DataContext="{TemplateBinding Header}" 
                              Padding="{TemplateBinding Padding}"
                              TemplatedControl.IsTemplateFocusTarget="True"
                              Grid.Column="1"/>
--- a/src/Perspex.Themes.Default/Window.xaml
+++ b/src/Perspex.Themes.Default/Window.xaml
@ -6,10 +6,7 @@
    <ControlTemplate>
      <Border Background="{TemplateBinding Background}">
        <AdornerDecorator>
-          <ContentPresenter Name="PART_ContentPresenter" 
-                            Content="{TemplateBinding Content}"
-                            DataContext="{TemplateBinding Content}" 
-                            Margin="{TemplateBinding Padding}"/>
+          <ContentPresenter Name="PART_ContentPresenter" Content="{TemplateBinding Content}" Margin="{TemplateBinding Padding}"/>
        </AdornerDecorator>
      </Border>
    </ControlTemplate>