Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions Source/ViewModels/RequirementGroupViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -206,16 +206,14 @@ private static void UpdateDependencies(List<RequirementViewModel> list)

private static CodeNote UpdateParentNote(Requirement requirement, CodeNote parentNote, IDictionary<uint, CodeNote> notes)
{
if (requirement.Type == RequirementType.AddAddress && requirement.Left.IsMemoryReference)
{
var leftNote = CodeNote.ResolveNote(requirement.Left.Value, notes, parentNote);
return (leftNote != null && leftNote.IsPointer) ? leftNote : null;
}
else if (requirement.Type != RequirementType.AddAddress)
{
if (requirement.Type != RequirementType.AddAddress)
return null;
}
return parentNote;

if (!requirement.Left.IsMemoryReference)
return parentNote;

var leftNote = CodeNote.ResolveNote(requirement.Left.Value, notes, parentNote);
return (leftNote != null && leftNote.IsPointer) ? leftNote : null;
}

private static void AppendRequirements(List<RequirementViewModel> list, RequirementEx left, RequirementEx right, NumberFormat numberFormat, IDictionary<uint, CodeNote> notes)
Expand Down
5 changes: 5 additions & 0 deletions Source/ViewModels/RequirementViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ private set

public bool IsNoteShortened { get; private set; }

public bool IsAddAddress
{
get { return Requirement?.Type == RequirementType.AddAddress; }
}

internal virtual void OnShowHexValuesChanged(ModelPropertyChangedEventArgs e)
{
if (Requirement != null)
Expand Down
12 changes: 11 additions & 1 deletion Source/Views/AssetViewer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,17 @@

<DataTemplate x:Key="codeNotesStackPanelTemplate">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding NotesShort}" Style="{StaticResource themedTextBlock}" TextWrapping="Wrap" FontStyle="Italic" />
<TextBlock Text="{Binding NotesShort}" TextWrapping="Wrap" FontStyle="Italic">
<TextBlock.Style>
<Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource themedTextBlock}">
<Style.Triggers>
<DataTrigger Binding="{Binding IsAddAddress}" Value="True">
<Setter Property="Opacity" Value="0.6" />
</DataTrigger>
</Style.Triggers>
</Style>
</TextBlock.Style>
</TextBlock>
<Border BorderBrush="{Binding DataContext.Resources.ScrollBarForegroundBrush, ElementName=gameGrid}"
BorderThickness="2" CornerRadius="4" Margin="6,0,0,0">
<Border.Style>
Expand Down
Loading