From 60b4660245ecc9937fdb6f10f302dd2d5d7611fc Mon Sep 17 00:00:00 2001
From: Yoshi Askharoun <jjask7@gmail.com>
Date: Sat, 23 Oct 2021 21:51:51 -0500
Subject: [PATCH] Actually fixed AbstractUI binding

---
 .../Themes/AbstractBooleanStyle.xaml          | 19 ++++++++++---------
 .../Themes/AbstractButtonStyle.xaml           |  1 +
 .../Themes/AbstractDataListStyle.xaml         |  1 +
 .../AbstractMultiChoiceUIElementStyle.xaml    |  1 +
 .../AbstractProgressUIElementStyle.xaml       |  1 +
 .../Themes/AbstractRichTextBlockStyle.xaml    |  1 +
 .../Themes/AbstractTextBoxStyle.xaml          |  1 +
 .../Themes/AbstractUIGroupPresenterStyle.xaml | 14 +++++++-------
 8 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml
index 688283b..91d873d 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml
@@ -13,23 +13,23 @@
 
     <DataTemplate x:Key="DefaultAbstractBooleanTemplate" DataType="abstractUI:AbstractBooleanViewModel">
         <StackPanel Margin="0,0,0,4">
-            <TextBlock Text="{Binding DataContext.Title, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"
+            <TextBlock Text="{Binding Title, Mode=OneWay}"
                        FontSize="{StaticResource DefaultAbstractUITitleFontSize}"
-                       ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"
-                       Visibility="{Binding DataContext.Title, TargetNullValue=Collapsed, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}" />
+                       ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
+                       Visibility="{Binding Title, TargetNullValue=Collapsed, Mode=OneWay}" />
 
-            <TextBlock Text="{Binding DataContext.Subtitle, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"
+            <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
                        FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
                        FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
                        Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"
-                       Visibility="{Binding DataContext.Subtitle, TargetNullValue=Collapsed, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"/>
+                       Visibility="{Binding Subtitle, TargetNullValue=Collapsed}"/>
 
-            <CheckBox ToolTipService.ToolTip="{Binding DataContext.TooltipText, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"
-                      Content="{Binding DataContext.Label, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"
-                      IsChecked="{Binding DataContext.IsToggled, Mode=TwoWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}">
+            <CheckBox ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
+                      Content="{Binding Label, Mode=OneWay}"
+                      IsChecked="{Binding IsToggled, Mode=TwoWay}">
                 <behaviors:Interaction.Triggers>
                     <behaviors:EventTrigger EventName="Checked">
-                        <behaviors:InvokeCommandAction Command="{Binding DataContext.ToggledCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}" />
+                        <behaviors:InvokeCommandAction Command="{Binding ToggledCommand}" />
                     </behaviors:EventTrigger>
                 </behaviors:Interaction.Triggers>
             </CheckBox>
@@ -42,6 +42,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractBooleanPresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml
index 245f076..5937971 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml
@@ -61,6 +61,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractButtonPresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractButtonTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
index af7c25c..01250bd 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
@@ -190,6 +190,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractDataListPresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractDataListTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
index 61a9e15..92c5161 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
@@ -67,6 +67,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractMultiChoicePresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractMultipleChoiceTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
index 03d3d37..091dd46 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
@@ -30,6 +30,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractButtonPresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
index d381471..b3a2701 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
@@ -29,6 +29,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractTextBoxPresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractRichTextBlockTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml
index 412b7c8..1d01f59 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml
@@ -38,6 +38,7 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:AbstractTextBoxPresenter">
                         <ContentControl ContentTemplate="{StaticResource DefaultAbstractTextBoxTemplate}"
+                                        Content="{Binding}"
                                         HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
                     </ControlTemplate>
                 </Setter.Value>
diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
index 03d3251..80ea498 100644
--- a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
+++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
@@ -23,43 +23,43 @@
     <controls:AbstractUIGroupItemTemplateSelector x:Key="GroupTemplateSelector">
         <controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractBooleanViewModel">
-                <controls:AbstractBooleanPresenter />
+                <controls:AbstractBooleanPresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate>
 
         <controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractButtonViewModel">
-                <controls:AbstractButtonPresenter />
+                <controls:AbstractButtonPresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate>
 
         <controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractDataListViewModel">
-                <controls:AbstractDataListPresenter />
+                <controls:AbstractDataListPresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
 
         <controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractMultiChoiceUIElementViewModel">
-                <controls:AbstractMultiChoicePresenter />
+                <controls:AbstractMultiChoicePresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
 
         <controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractProgressUIElementViewModel">
-                <controls:AbstractProgessUIElementPresenter />
+                <controls:AbstractProgessUIElementPresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
 
         <controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractTextBoxViewModel">
-                <controls:AbstractTextBoxPresenter />
+                <controls:AbstractTextBoxPresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
 
         <controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
             <DataTemplate DataType="abstractUIVm:AbstractUIElementGroupViewModel">
-                <controls:AbstractUIGroupPresenter />
+                <controls:AbstractUIGroupPresenter DataContext="{Binding}" />
             </DataTemplate>
         </controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
     </controls:AbstractUIGroupItemTemplateSelector>