zune/ZuneModdingHelper
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneModdingHelper.git synced 2026-07-27 13:12:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Actually fixed AbstractUI binding

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml
+10 -9
View File
@@ -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>
OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml
+1
View File
@@ -61,6 +61,7 @@
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractButtonPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractButtonTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
</Setter.Value>
OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
+1
View File
@@ -190,6 +190,7 @@
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractDataListPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractDataListTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
</Setter.Value>
OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
+1
View File
@@ -67,6 +67,7 @@
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractMultiChoicePresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractMultipleChoiceTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
</Setter.Value>
OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
+1
View File
@@ -30,6 +30,7 @@
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractButtonPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
</Setter.Value>
OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
+1
View File
@@ -29,6 +29,7 @@
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractTextBoxPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractRichTextBlockTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
</Setter.Value>
OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml
+1
View File
@@ -38,6 +38,7 @@
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractTextBoxPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractTextBoxTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
</Setter.Value>
OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
+7 -7
View File
@@ -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>