Resolved identified XAML binding errors

imchillin · Sep 3, 2024 · e8d799e · e8d799e
1 parent 3138983
commit e8d799e
Show file tree

Hide file tree

Showing 12 changed files with 72 additions and 50 deletions.
diff --git a/Anamnesis/Actor/Converters/ExtendedWeaponToSubModelConverter.cs b/Anamnesis/Actor/Converters/ExtendedWeaponToSubModelConverter.cs
@@ -0,0 +1,29 @@
+// © Anamnesis.
+// Licensed under the MIT license.
+
+namespace Anamnesis.Actor.Converters;
+
+using Anamnesis.Memory;
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+[ValueConversion(typeof(ExtendedWeaponMemory), typeof(WeaponSubModelMemory))]
+public class ExtendedWeaponToSubModelConverter : IValueConverter
+{
+	public object? Convert(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		if (value is ExtendedWeaponMemory extendedWeaponMemory)
+		{
+			return extendedWeaponMemory.SubModel;
+		}
+
+		return DependencyProperty.UnsetValue;
+	}
+
+	public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+	{
+		throw new NotImplementedException();
+	}
+}
diff --git a/Anamnesis/Actor/Pages/ActionPage.xaml b/Anamnesis/Actor/Pages/ActionPage.xaml
@@ -169,7 +169,7 @@
                         </Grid>
 
 
-                        <Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Click="OnBlendAnimation" IsEnabled="{Binding AnimationService.BlendLocked, Converter={StaticResource NotConverter}}" Style="{StaticResource TransparentButton}">
+						<Button Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Click="OnBlendAnimation" IsEnabled="{Binding Actor.Animation.BlendLocked, Converter={StaticResource NotConverter}}" Style="{StaticResource TransparentButton}">
                             <XivToolsWpf:TextBlock Key="Character_Action_AnimationBlend"/>
                         </Button>
 
@@ -409,8 +409,7 @@
 											   Grid.Column="0"
 											   Style="{StaticResource Label}" />
 
-                    <ToggleButton Grid.Row="0" Grid.Column="1" Height="20" Style="{StaticResource TransparentIconToggleButton}" IsEnabled="{Binding GposeService.IsGpose}" IsChecked="{Binding PoseService.FreezeWorldPosition}" BorderThickness="1" Padding="0" Margin="0"
-							  Visibility="{Binding IsValidWeapon, Converter={StaticResource B2V}}">
+                    <ToggleButton Grid.Row="0" Grid.Column="1" Height="20" Style="{StaticResource TransparentIconToggleButton}" IsEnabled="{Binding GposeService.IsGpose}" IsChecked="{Binding PoseService.FreezeWorldPosition}" BorderThickness="1" Padding="0" Margin="0">
 
                         <ToggleButton.ToolTip>
                             <XivToolsWpf:TextBlock Key="Character_Action_GlobalFreezeWorldPositionsTooltip"/>
@@ -424,8 +423,7 @@
 											   Grid.Column="0"
 											   Style="{StaticResource Label}" />
 
-                    <ToggleButton Grid.Row="1" Grid.Column="1" Height="20" Style="{StaticResource TransparentIconToggleButton}" IsEnabled="{Binding GposeService.IsGpose}" IsChecked="{Binding AnimationService.SpeedControlEnabled}" BorderThickness="1" Padding="0" Margin="0"
-							  Visibility="{Binding IsValidWeapon, Converter={StaticResource B2V}}">
+                    <ToggleButton Grid.Row="1" Grid.Column="1" Height="20" Style="{StaticResource TransparentIconToggleButton}" IsEnabled="{Binding GposeService.IsGpose}" IsChecked="{Binding AnimationService.SpeedControlEnabled}" BorderThickness="1" Padding="0" Margin="0">
                         <fa:IconBlock Icon="Stopwatch" FontSize="10"/>
                     </ToggleButton>
 

diff --git a/Anamnesis/Actor/Pages/PosePage.xaml b/Anamnesis/Actor/Pages/PosePage.xaml
@@ -298,8 +298,7 @@
 
 							<CheckBox Margin="3,0,6,0"
 									  IsEnabled="{Binding GposeService.IsGpose}"
-									  IsChecked="{Binding PoseService.FreezeWorldPosition}"
-									  Visibility="{Binding IsValidWeapon, Converter={StaticResource B2V}}">
+									  IsChecked="{Binding PoseService.FreezeWorldPosition}">
 
 								<ToggleButton.ToolTip>
 									<XivToolsWpf:TextBlock Key="Character_Action_GlobalFreezeWorldPositionsTooltip"/>

diff --git a/Anamnesis/Actor/Posing/Views/PoseMatrixView.xaml b/Anamnesis/Actor/Posing/Views/PoseMatrixView.xaml
@@ -351,10 +351,7 @@
 									  ItemsSource="{Binding HairBones}">
 							<ItemsControl.ItemsPanel>
 								<ItemsPanelTemplate>
-									<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
-											   ItemWidth="{Binding (ListView.View).ItemWidth, RelativeSource={RelativeSource AncestorType=ListView}}"
-											   MinWidth="{Binding ItemWidth, RelativeSource={RelativeSource Self}}"
-											   ItemHeight="{Binding (ListView.View).ItemHeight, RelativeSource={RelativeSource AncestorType=ListView}}" />
+									<WrapPanel/>
 								</ItemsPanelTemplate>
 							</ItemsControl.ItemsPanel>
 
@@ -943,10 +940,7 @@
 										  ItemsSource="{Binding MetBones}">
 								<ItemsControl.ItemsPanel>
 									<ItemsPanelTemplate>
-										<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
-												   ItemWidth="{Binding (ListView.View).ItemWidth, RelativeSource={RelativeSource AncestorType=ListView}}"
-												   MinWidth="{Binding ItemWidth, RelativeSource={RelativeSource Self}}"
-												   ItemHeight="{Binding (ListView.View).ItemHeight, RelativeSource={RelativeSource AncestorType=ListView}}" />
+										<WrapPanel/>
 									</ItemsPanelTemplate>
 								</ItemsControl.ItemsPanel>
 
@@ -968,10 +962,7 @@
 							<ItemsControl Grid.Column="1" ItemsSource="{Binding TopBones}">
 								<ItemsControl.ItemsPanel>
 									<ItemsPanelTemplate>
-										<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
-												   ItemWidth="{Binding (ListView.View).ItemWidth, RelativeSource={RelativeSource AncestorType=ListView}}"
-												   MinWidth="{Binding ItemWidth, RelativeSource={RelativeSource Self}}"
-												   ItemHeight="{Binding (ListView.View).ItemHeight, RelativeSource={RelativeSource AncestorType=ListView}}" />
+										<WrapPanel/>
 									</ItemsPanelTemplate>
 								</ItemsControl.ItemsPanel>
 
@@ -1014,10 +1005,7 @@
 										  ItemsSource="{Binding MainHandBones}">
 								<ItemsControl.ItemsPanel>
 									<ItemsPanelTemplate>
-										<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
-												   ItemWidth="{Binding (ListView.View).ItemWidth, RelativeSource={RelativeSource AncestorType=ListView}}"
-												   MinWidth="{Binding ItemWidth, RelativeSource={RelativeSource Self}}"
-												   ItemHeight="{Binding (ListView.View).ItemHeight, RelativeSource={RelativeSource AncestorType=ListView}}" />
+										<WrapPanel/>
 									</ItemsPanelTemplate>
 								</ItemsControl.ItemsPanel>
 
@@ -1039,10 +1027,7 @@
 							<ItemsControl Grid.Column="1" ItemsSource="{Binding OffHandBones}">
 								<ItemsControl.ItemsPanel>
 									<ItemsPanelTemplate>
-										<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
-												   ItemWidth="{Binding (ListView.View).ItemWidth, RelativeSource={RelativeSource AncestorType=ListView}}"
-												   MinWidth="{Binding ItemWidth, RelativeSource={RelativeSource Self}}"
-												   ItemHeight="{Binding (ListView.View).ItemHeight, RelativeSource={RelativeSource AncestorType=ListView}}" />
+										<WrapPanel/>
 									</ItemsPanelTemplate>
 								</ItemsControl.ItemsPanel>
 

diff --git a/Anamnesis/Actor/Views/EquipmentEditor.xaml b/Anamnesis/Actor/Views/EquipmentEditor.xaml
@@ -4,9 +4,14 @@
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
 			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
 			 xmlns:local="clr-namespace:Anamnesis.Actor.Views"
+			 xmlns:converters="clr-namespace:Anamnesis.Actor.Converters"
 			 mc:Ignorable="d"
 			 d:DesignHeight="600">
 
+	<UserControl.Resources>
+		<converters:ExtendedWeaponToSubModelConverter x:Key="ExtendedWeaponToSubModelConverter"/>
+	</UserControl.Resources>
+
 	<Grid x:Name="ContentArea">
 		<Grid.ColumnDefinitions>
 			<ColumnDefinition />
@@ -22,7 +27,7 @@
 			<RowDefinition/>
 		</Grid.RowDefinitions>
 
-		<local:ItemView Grid.Row="0" Grid.Column="0" ItemModel="{Binding MainHand}" ExtendedViewModel="{Binding ModelObject.Weapons}"  Slot="MainHand" IsEnabled="{Binding IsChocobo, Converter={StaticResource !B}}"/>
+		<local:ItemView Grid.Row="0" Grid.Column="0" ItemModel="{Binding MainHand}" ExtendedViewModel="{Binding ModelObject.Weapons, Converter={StaticResource ExtendedWeaponToSubModelConverter}}" Slot="MainHand" IsEnabled="{Binding IsChocobo, Converter={StaticResource !B}}"/>
 		<local:ItemView Grid.Row="0" Grid.Column="1" ItemModel="{Binding OffHand}" ExtendedViewModel="{Binding ModelObject.Weapons.SubModel}" Slot="OffHand" IsEnabled="{Binding IsChocobo, Converter={StaticResource !B}}"/>
 		<local:ItemView Grid.Row="1" Grid.Column="0" ItemModel="{Binding Equipment.Head}" Slot="Head"/>
 		<local:ItemView Grid.Row="2" Grid.Column="0" ItemModel="{Binding Equipment.Chest}" Slot="Body" />

diff --git a/Anamnesis/Actor/Views/EquipmentSelector.xaml b/Anamnesis/Actor/Views/EquipmentSelector.xaml
@@ -12,6 +12,13 @@
 			 mc:Ignorable="d" 
 			 d:DesignHeight="450">
 
+	<UserControl.Resources>
+		<Style x:Key="SelectorItemStyle" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MaterialDesignListBoxItem}">
+			<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+			<Setter Property="VerticalContentAlignment" Value="Top"/>
+		</Style>
+	</UserControl.Resources>
+
 	<Grid x:Name="ContentArea">
 
 		<Grid.ColumnDefinitions>
@@ -178,11 +185,12 @@
 		<xivToolsWpfSelectors:Selector
 			Grid.Column="1"
 			Grid.Row="2"
-			Width="300">
+			Width="300"
+			ListBoxItemStyle="{StaticResource SelectorItemStyle}">
 
 			<xivToolsWpfSelectors:Selector.ItemTemplate>
 				<DataTemplate>
-					<Grid Height="32" Margin="0, -2">
+					<Grid Height="32">
 						<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto"/>
 							<ColumnDefinition/>

diff --git a/Anamnesis/Actor/Views/FacialFeaturesControl.xaml b/Anamnesis/Actor/Views/FacialFeaturesControl.xaml
@@ -16,6 +16,8 @@
 			<Setter Property="IsSelected" Value="{Binding Selected}" />
 			<Setter Property="BorderThickness" Value="0" />
 			<Setter Property="Background" Value="Transparent" />
+			<Setter Property="HorizontalContentAlignment" Value="Left" />
+			<Setter Property="VerticalContentAlignment" Value="Top" />
 			<Setter Property="Template">
 				<Setter.Value>
 					<ControlTemplate TargetType="ListBoxItem">

diff --git a/Anamnesis/MainWindow.xaml b/Anamnesis/MainWindow.xaml
@@ -46,11 +46,11 @@
 											  Click="OnTargetActorClicked"
 											  Header="Target" />
 
-                                <MenuItem Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=SettingsService.Settings.UseExternalRefreshBrio, Converter={StaticResource B2V}}" 
+								<MenuItem Visibility="{Binding DataContext.SettingsService.Settings.UseExternalRefreshBrio, Source={x:Reference PinnedActorList}, Converter={StaticResource B2V}}" 
 											  IsEnabled="{Binding IsGPoseActor}"
 											  Click="OnDespawnActorClicked"
 											  Header="Despawn" />
-                            </ContextMenu>
+								</ContextMenu>
 							</ToggleButton.ContextMenu>
 
 						<Grid Margin="6,0">
@@ -147,7 +147,7 @@
 				<ScaleTransform x:Name="WindowScale" ScaleX="0.5" ScaleY="0.5" />
 			</Grid.LayoutTransform>
 
-			<Grid IsEnabled="{Binding GposeService.IsNotChangingState}" Margin="3,0,3,3">
+			<Grid IsEnabled="{Binding GposeService.Initialized}" Margin="3,0,3,3">
 
 				<Grid.RowDefinitions>
 					<RowDefinition Height="Auto"/>

diff --git a/Anamnesis/Services/GposeService.cs b/Anamnesis/Services/GposeService.cs
@@ -3,26 +3,22 @@
 
 namespace Anamnesis.Services;
 
-using System;
-using System.Threading.Tasks;
 using Anamnesis.Core.Memory;
 using Anamnesis.Memory;
 using PropertyChanged;
+using System;
+using System.Threading.Tasks;
 
 public delegate void GposeEvent(bool newState);
 
 [AddINotifyPropertyChangedInterface]
 public class GposeService : ServiceBase<GposeService>
 {
-	private bool initialized = false;
-
 	public static event GposeEvent? GposeStateChanged;
 
+	public bool Initialized { get; private set; } = false;
 	public bool IsGpose { get; private set; }
 
-	[DependsOn(nameof(IsGpose))]
-	public bool IsOverworld => !this.IsGpose;
-
 	public static bool GetIsGPose()
 	{
 		if (AddressService.GposeCheck == IntPtr.Zero)
@@ -50,9 +46,9 @@ private async Task CheckThread()
 		{
 			bool newGpose = GetIsGPose();
 
-			if (!this.initialized)
+			if (!this.Initialized)
 			{
-				this.initialized = true;
+				this.Initialized = true;
 				this.IsGpose = newGpose;
 				continue;
 			}

diff --git a/Anamnesis/Services/PinnedActor.cs b/Anamnesis/Services/PinnedActor.cs
@@ -3,10 +3,6 @@
 
 namespace Anamnesis;
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Threading.Tasks;
 using Anamnesis.Actor;
 using Anamnesis.Files;
 using Anamnesis.Memory;
@@ -15,6 +11,10 @@ namespace Anamnesis;
 using FontAwesome.Sharp;
 using PropertyChanged;
 using Serilog;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Threading.Tasks;
 using XivToolsWpf.Extensions;
 
 [AddINotifyPropertyChangedInterface]
@@ -146,7 +146,7 @@ public void Tick()
 				return;
 			}
 
-			if (this.IsGPoseActor && GposeService.Instance.IsOverworld)
+			if (this.IsGPoseActor && !GposeService.Instance.IsGpose)
 			{
 				Log.Information($"Actor: {this} was a gpose actor and we are now in the overworld");
 				this.Retarget();

diff --git a/Anamnesis/Views/Gallery.xaml b/Anamnesis/Views/Gallery.xaml
@@ -48,7 +48,7 @@
 				<Grid>
 					<Rectangle Fill="White" Margin="-3"/>
 					<TextBlock Text="Oops! No Image!" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black" Margin="0, 0, 0, 20"/>
-					<Image Source="{Binding Image1Path}" x:Name="Image1" Margin="0, 0, 0, 20"/>
+					<Image Source="{Binding Image1Path, TargetNullValue={x:Null}}" x:Name="Image1" Margin="0, 0, 0, 20"/>
 					<TextBlock Text="{Binding Image1Author}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="Black" Margin="2, 4, 2, 0"/>
 				</Grid>
 			</Border>
@@ -65,7 +65,7 @@
 				<Grid>
 					<Rectangle Fill="White" Margin="-3"/>
 					<TextBlock Text="Oops! No Image!" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="Black" Margin="0, 0, 0, 20"/>
-					<Image Source="{Binding Image2Path}" x:Name="Image2" Margin="0, 0, 0, 20"/>
+					<Image Source="{Binding Image2Path, TargetNullValue={x:Null}}" x:Name="Image2" Margin="0, 0, 0, 20"/>
 					<TextBlock Text="{Binding Image2Author}" HorizontalAlignment="Right" VerticalAlignment="Bottom" Foreground="Black" Margin="2, 4, 2, 0"/>
 				</Grid>
 			</Border>

diff --git a/Lib/XivToolsWpf b/Lib/XivToolsWpf