Skip to content

show offset within note as hex if greater than 9 #1289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jamiras merged 1 commit into from
Feb 21, 2026
Merged

show offset within note as hex if greater than 9 #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/ui/viewmodels/TriggerConditionViewModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,11 @@ std::wstring TriggerConditionViewModel::GetAddressTooltip(ra::data::ByteAddress
pNote = pCodeNotes->FindCodeNoteModel(nNoteStart);

if (sPointerChain.empty())
sAddress = ra::util::String::Printf(L"%s (%s+%u)", pMemoryContext.FormatAddress(nAddress), pMemoryContext.FormatAddress(nNoteStart), nAddress - nNoteStart);
{
const auto nOffset = nAddress - nNoteStart;
const wchar_t* sFormat = nOffset < 10 ? L"%s (%s+%u)" : L"%s (%s+0x%02x)";
sAddress = ra::util::String::Printf(sFormat, pMemoryContext.FormatAddress(nAddress), pMemoryContext.FormatAddress(nNoteStart), nOffset);
}
}
}
}
Expand Down
18 changes: 18 additions & 0 deletions tests/ui/viewmodels/TriggerConditionViewModel_Tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,24 @@ TEST_CLASS(TriggerConditionViewModel_Tests)
Assert::AreEqual(std::wstring(L"0x000c (0x0008+4)\r\n[8 bytes] This is a note."), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
}

TEST_METHOD(TestTooltipAddressLargeArrayNote)
{
TriggerConditionViewModelHarness condition;
condition.mockGameContext.SetCodeNote({ 8U }, L"[100 bytes] This is a note.");

condition.Parse("0xH0008=3");
Assert::AreEqual(std::wstring(L"0x0008\r\n[100 bytes] This is a note."), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));

condition.Parse("0xH000C=3");
Assert::AreEqual(std::wstring(L"0x000c (0x0008+4)\r\n[100 bytes] This is a note."), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));

condition.Parse("0xH0016=3");
Assert::AreEqual(std::wstring(L"0x0016 (0x0008+0x0e)\r\n[100 bytes] This is a note."), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));

condition.Parse("0xH003E=3");
Assert::AreEqual(std::wstring(L"0x003e (0x0008+0x36)\r\n[100 bytes] This is a note."), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
}

TEST_METHOD(TestTooltipAddressBitNote)
{
TriggerConditionViewModelHarness condition;
Expand Down
Loading