Actually fixed AbstractUI binding

This commit is contained in:
Yoshi Askharoun
2021-10-23 21:51:51 -05:00
parent 3ae029b5d5
commit 60b4660245
8 changed files with 23 additions and 16 deletions
@@ -13,23 +13,23 @@
<DataTemplate x:Key="DefaultAbstractBooleanTemplate" DataType="abstractUI:AbstractBooleanViewModel"> <DataTemplate x:Key="DefaultAbstractBooleanTemplate" DataType="abstractUI:AbstractBooleanViewModel">
<StackPanel Margin="0,0,0,4"> <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}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}"
ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Visibility="{Binding DataContext.Title, TargetNullValue=Collapsed, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}" /> 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}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" 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}}" <CheckBox ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Content="{Binding DataContext.Label, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}" Content="{Binding Label, Mode=OneWay}"
IsChecked="{Binding DataContext.IsToggled, Mode=TwoWay, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}"> IsChecked="{Binding IsToggled, Mode=TwoWay}">
<behaviors:Interaction.Triggers> <behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Checked"> <behaviors:EventTrigger EventName="Checked">
<behaviors:InvokeCommandAction Command="{Binding DataContext.ToggledCommand, RelativeSource={RelativeSource FindAncestor, AncestorType=ContentControl}}" /> <behaviors:InvokeCommandAction Command="{Binding ToggledCommand}" />
</behaviors:EventTrigger> </behaviors:EventTrigger>
</behaviors:Interaction.Triggers> </behaviors:Interaction.Triggers>
</CheckBox> </CheckBox>
@@ -42,6 +42,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractBooleanPresenter"> <ControlTemplate TargetType="controls:AbstractBooleanPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -61,6 +61,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractButtonPresenter"> <ControlTemplate TargetType="controls:AbstractButtonPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractButtonTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractButtonTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -190,6 +190,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractDataListPresenter"> <ControlTemplate TargetType="controls:AbstractDataListPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractDataListTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractDataListTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -67,6 +67,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractMultiChoicePresenter"> <ControlTemplate TargetType="controls:AbstractMultiChoicePresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractMultipleChoiceTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractMultipleChoiceTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -30,6 +30,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractButtonPresenter"> <ControlTemplate TargetType="controls:AbstractButtonPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -29,6 +29,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractTextBoxPresenter"> <ControlTemplate TargetType="controls:AbstractTextBoxPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractRichTextBlockTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractRichTextBlockTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -38,6 +38,7 @@
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="controls:AbstractTextBoxPresenter"> <ControlTemplate TargetType="controls:AbstractTextBoxPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractTextBoxTemplate}" <ContentControl ContentTemplate="{StaticResource DefaultAbstractTextBoxTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" /> HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -23,43 +23,43 @@
<controls:AbstractUIGroupItemTemplateSelector x:Key="GroupTemplateSelector"> <controls:AbstractUIGroupItemTemplateSelector x:Key="GroupTemplateSelector">
<controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate> <controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate>
<DataTemplate DataType="abstractUIVm:AbstractBooleanViewModel"> <DataTemplate DataType="abstractUIVm:AbstractBooleanViewModel">
<controls:AbstractBooleanPresenter /> <controls:AbstractBooleanPresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate> </controls:AbstractUIGroupItemTemplateSelector.BooleanTemplate>
<controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate> <controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate>
<DataTemplate DataType="abstractUIVm:AbstractButtonViewModel"> <DataTemplate DataType="abstractUIVm:AbstractButtonViewModel">
<controls:AbstractButtonPresenter /> <controls:AbstractButtonPresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate> </controls:AbstractUIGroupItemTemplateSelector.ButtonTemplate>
<controls:AbstractUIGroupItemTemplateSelector.DataListTemplate> <controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
<DataTemplate DataType="abstractUIVm:AbstractDataListViewModel"> <DataTemplate DataType="abstractUIVm:AbstractDataListViewModel">
<controls:AbstractDataListPresenter /> <controls:AbstractDataListPresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.DataListTemplate> </controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
<controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate> <controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
<DataTemplate DataType="abstractUIVm:AbstractMultiChoiceUIElementViewModel"> <DataTemplate DataType="abstractUIVm:AbstractMultiChoiceUIElementViewModel">
<controls:AbstractMultiChoicePresenter /> <controls:AbstractMultiChoicePresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate> </controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
<controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate> <controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
<DataTemplate DataType="abstractUIVm:AbstractProgressUIElementViewModel"> <DataTemplate DataType="abstractUIVm:AbstractProgressUIElementViewModel">
<controls:AbstractProgessUIElementPresenter /> <controls:AbstractProgessUIElementPresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate> </controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
<controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate> <controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
<DataTemplate DataType="abstractUIVm:AbstractTextBoxViewModel"> <DataTemplate DataType="abstractUIVm:AbstractTextBoxViewModel">
<controls:AbstractTextBoxPresenter /> <controls:AbstractTextBoxPresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate> </controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
<controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate> <controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
<DataTemplate DataType="abstractUIVm:AbstractUIElementGroupViewModel"> <DataTemplate DataType="abstractUIVm:AbstractUIElementGroupViewModel">
<controls:AbstractUIGroupPresenter /> <controls:AbstractUIGroupPresenter DataContext="{Binding}" />
</DataTemplate> </DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate> </controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
</controls:AbstractUIGroupItemTemplateSelector> </controls:AbstractUIGroupItemTemplateSelector>