Updated packages

This commit is contained in:
Yoshi Askharoun
2021-11-10 21:21:25 -06:00
parent 691b0667bc
commit 6bd36a292f
17 changed files with 80 additions and 80 deletions
@@ -4,7 +4,7 @@ using OwlCore.AbstractUI.Models;
namespace OwlCore.Wpf.AbstractUI.Controls
{
/// <summary>
/// A control that displays an <see cref="AbstractBooleanUIElement"/>.
/// A control that displays an <see cref="AbstractBoolean"/>.
/// </summary>
public partial class AbstractBooleanPresenter : Control
{
@@ -56,7 +56,7 @@ namespace OwlCore.Wpf.AbstractUI.Controls
}
/// <summary>
/// The data template used to display an <see cref="AbstractUIElementGroup"/>.
/// The data template used to display an <see cref="AbstractUICollection"/>.
/// </summary>
public DataTemplate? ElementGroupTemplate { get; set; }
@@ -76,7 +76,7 @@ namespace OwlCore.Wpf.AbstractUI.Controls
public DataTemplate ButtonTemplate { get; set; }
/// <summary>
/// The data template used to display an <see cref="AbstractBooleanUIElement"/>.
/// The data template used to display an <see cref="AbstractBoolean"/>.
/// </summary>
public DataTemplate BooleanTemplate { get; set; }
@@ -93,7 +93,7 @@ namespace OwlCore.Wpf.AbstractUI.Controls
/// <inheritdoc />
public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (!new Themes.AbstractUIGroupPresenterStyle().TryGetValue("DefaultAbstractUIElementGroupTemplate", out var elementGroupTemplate))
if (!new Themes.AbstractUIGroupPresenterStyle().TryGetValue("DefaultAbstractUICollectionTemplate", out var elementGroupTemplate))
ElementGroupTemplate = ThrowHelper.ThrowArgumentNullException<DataTemplate>(nameof(elementGroupTemplate));
ElementGroupTemplate = (DataTemplate)elementGroupTemplate;
@@ -103,10 +103,10 @@ namespace OwlCore.Wpf.AbstractUI.Controls
AbstractTextBoxViewModel => TextBoxTemplate,
AbstractDataListViewModel => DataListTemplate,
AbstractButtonViewModel => ButtonTemplate,
AbstractMultiChoiceUIElementViewModel => MultiChoiceTemplate,
AbstractMultiChoiceViewModel => MultiChoiceTemplate,
AbstractBooleanViewModel => BooleanTemplate,
AbstractProgressUIElementViewModel => ProgressTemplate,
AbstractUIElementGroupViewModel => ElementGroupTemplate,
AbstractProgressIndicatorViewModel => ProgressTemplate,
AbstractUICollectionViewModel => ElementGroupTemplate,
_ => null!
};
}
@@ -16,7 +16,7 @@ namespace OwlCore.Wpf.AbstractUI.Controls
/// Backing property for <see cref="ViewModel"/>.
/// </summary>
public static readonly DependencyProperty ViewModelProperty =
DependencyProperty.Register(nameof(ViewModel), typeof(AbstractUIElementGroupViewModel), typeof(AbstractUIGroupPresenter), new PropertyMetadata(null, (d, e) => ((AbstractUIGroupPresenter)d).OnViewModelChanged()));
DependencyProperty.Register(nameof(ViewModel), typeof(AbstractUICollectionViewModel), typeof(AbstractUIGroupPresenter), new PropertyMetadata(null, (d, e) => ((AbstractUIGroupPresenter)d).OnViewModelChanged()));
/// <summary>
/// Backing property for <see cref="TemplateSelector"/>.
@@ -27,9 +27,9 @@ namespace OwlCore.Wpf.AbstractUI.Controls
/// <summary>
/// The ViewModel for this UserControl.
/// </summary>
public AbstractUIElementGroupViewModel? ViewModel
public AbstractUICollectionViewModel? ViewModel
{
get => (AbstractUIElementGroupViewModel)GetValue(ViewModelProperty);
get => (AbstractUICollectionViewModel)GetValue(ViewModelProperty);
set => SetValue(ViewModelProperty, value);
}
@@ -71,10 +71,10 @@ namespace OwlCore.Wpf.AbstractUI.Controls
_dataContextBeingSet = true;
if (DataContext is AbstractUIElementGroup elementGroup)
ViewModel = new AbstractUIElementGroupViewModel(elementGroup);
if (DataContext is AbstractUICollection elementGroup)
ViewModel = new AbstractUICollectionViewModel(elementGroup);
if (DataContext is AbstractUIElementGroupViewModel elementGroupViewModel)
if (DataContext is AbstractUICollectionViewModel elementGroupViewModel)
ViewModel = elementGroupViewModel;
_dataContextBeingSet = false;
@@ -26,7 +26,7 @@
<CheckBox ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Content="{Binding Label, Mode=OneWay}"
IsChecked="{Binding IsToggled, Mode=TwoWay}">
IsChecked="{Binding IsToggled, Mode=OneWay}">
<behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="Checked">
<behaviors:InvokeCommandAction Command="{Binding ToggledCommand}" />
@@ -25,7 +25,7 @@ namespace OwlCore.Wpf.AbstractUI.Themes
/// <inheritdoc />
public override DataTemplate SelectTemplate(object item, DependencyObject container)
{
if (item is AbstractMultiChoiceUIElementViewModel viewModel)
if (item is AbstractMultiChoiceViewModel viewModel)
{
return viewModel.PreferredDisplayMode switch
{
@@ -11,7 +11,7 @@
<ResourceDictionary Source="pack://application:,,,/OwlCore.Wpf;component/AbstractUI/Themes/AbstractUIResources.xaml" />
</ResourceDictionary.MergedDictionaries>
<DataTemplate x:Key="DefaultAbstractProgressUIElementTemplate" DataType="abstractUI:AbstractProgressUIElementViewModel">
<DataTemplate x:Key="DefaultAbstractProgressUIElementTemplate" DataType="abstractUI:AbstractProgressIndicatorViewModel">
<StackPanel>
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" />
@@ -29,7 +29,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractButtonPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanUIElementTemplate}"
<ContentControl ContentTemplate="{StaticResource DefaultAbstractBooleanTemplate}"
Content="{Binding}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
@@ -40,13 +40,13 @@
</controls:AbstractUIGroupItemTemplateSelector.DataListTemplate>
<controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
<DataTemplate DataType="abstractUIVm:AbstractMultiChoiceUIElementViewModel">
<DataTemplate DataType="abstractUIVm:AbstractMultiChoiceViewModel">
<controls:AbstractMultiChoicePresenter DataContext="{Binding}" />
</DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.MultiChoiceTemplate>
<controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
<DataTemplate DataType="abstractUIVm:AbstractProgressUIElementViewModel">
<DataTemplate DataType="abstractUIVm:AbstractProgressIndicatorViewModel">
<controls:AbstractProgessUIElementPresenter DataContext="{Binding}" />
</DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.ProgressTemplate>
@@ -58,13 +58,13 @@
</controls:AbstractUIGroupItemTemplateSelector.TextBoxTemplate>
<controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
<DataTemplate DataType="abstractUIVm:AbstractUIElementGroupViewModel">
<DataTemplate DataType="abstractUIVm:AbstractUICollectionViewModel">
<controls:AbstractUIGroupPresenter DataContext="{Binding}" />
</DataTemplate>
</controls:AbstractUIGroupItemTemplateSelector.ElementGroupTemplate>
</controls:AbstractUIGroupItemTemplateSelector>
<DataTemplate x:Key="DefaultAbstractUIElementGroupTemplate" DataType="abstractUIVm:AbstractUIElementGroupViewModel">
<DataTemplate x:Key="DefaultAbstractUICollectionTemplate" DataType="abstractUIVm:AbstractUICollectionViewModel">
<StackPanel Margin="10,20">
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="30" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
@@ -83,7 +83,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="controls:AbstractUIGroupPresenter">
<ContentControl ContentTemplate="{StaticResource DefaultAbstractUIElementGroupTemplate}"
<ContentControl ContentTemplate="{StaticResource DefaultAbstractUICollectionTemplate}"
Content="{TemplateBinding ViewModel}"
HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" />
</ControlTemplate>
+2 -2
View File
@@ -8,8 +8,8 @@
<ItemGroup>
<PackageReference Include="CommunityToolkit.Diagnostics" Version="7.0.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
<PackageReference Include="OwlCore" Version="0.0.21" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.37" />
<PackageReference Include="OwlCore" Version="0.0.31" />
</ItemGroup>
<ItemGroup>