fix enum matching for values when prefer decimal checked

Author: Jamiras

src/ui/viewmodels/TriggerConditionViewModel.cpp

@@ -434,7 +434,7 @@ std::wstring TriggerConditionViewModel::GetTooltip(const StringModelProperty& nP
         if (nType == TriggerOperandType::Value)
         {
             if (IsAddressType(GetTargetType()) && ra::data::Memory::SizeBits(GetTargetSize()) >= 8)
-                return GetPotentialEnumValueTooltip(GetSourceAddress(), GetTargetAddress());
+                return GetPotentialEnumValueTooltip(GetSourceValue(), GetTargetAddress());
 
             return GetValueTooltip(GetSourceAddress());
         }
@@ -463,7 +463,7 @@ std::wstring TriggerConditionViewModel::GetTooltip(const StringModelProperty& nP
         if (nType == TriggerOperandType::Value)
         {
             if (IsAddressType(GetSourceType()) && ra::data::Memory::SizeBits(GetSourceSize()) >= 8)
-                return GetPotentialEnumValueTooltip(GetTargetAddress(), GetSourceAddress());
+                return GetPotentialEnumValueTooltip(GetTargetValue(), GetSourceAddress());
 
             return GetValueTooltip(GetTargetAddress());
         }
@@ -508,10 +508,19 @@ std::wstring TriggerConditionViewModel::GetTooltip(const IntModelProperty& nProp
     return L"";
 }
 
-std::wstring TriggerConditionViewModel::GetPotentialEnumValueTooltip(unsigned int nValue, ra::data::ByteAddress nCompareAddress) const
+std::wstring TriggerConditionViewModel::GetPotentialEnumValueTooltip(const std::wstring& sValue, ra::data::ByteAddress nCompareAddress) const
 {
     const ra::data::models::MemoryNoteModel* pNote = nullptr;
 
+    uint32_t nValue;
+    std::wstring sError;
+
+    const auto& pConfiguration = ra::services::ServiceLocator::Get<ra::services::IConfiguration>();
+    if (pConfiguration.IsFeatureEnabled(ra::services::Feature::PreferDecimal))
+        ra::ParseUnsignedInt(sValue, 0xFFFFFFFF, nValue, sError);
+    else
+        ra::ParseHex(sValue, 0xFFFFFFFF, nValue, sError);
+
     if (IsIndirect())
     {
         std::wstring sPointerChain;

src/ui/viewmodels/TriggerConditionViewModel.hh

@@ -119,7 +119,7 @@ private:
 
     void SerializeAppendOperand(std::string& sBuffer, TriggerOperandType nType, ra::data::Memory::Size nSize, const std::wstring& nValue) const;
 
-    std::wstring GetPotentialEnumValueTooltip(unsigned int nValue, ra::data::ByteAddress nCompareAddress) const;
+    std::wstring GetPotentialEnumValueTooltip(const std::wstring& sValue, ra::data::ByteAddress nCompareAddress) const;
     static std::wstring GetValueTooltip(unsigned int nValue);
     std::wstring GetAddressTooltip(ra::data::ByteAddress nAddress, ra::data::Memory::Size nSize, const std::wstring& sPointerChain, const ra::data::models::MemoryNoteModel* pNote) const;
     std::wstring GetRecallTooltip(bool bOperand2) const;

tests/ui/viewmodels/TriggerConditionViewModel_Tests.cpp

@@ -772,17 +772,6 @@ TEST_CLASS(TriggerConditionViewModel_Tests)
         Assert::AreEqual(std::wstring(L""), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
     }
 
-    TEST_METHOD(TestTooltipValueEnum)
-    {
-        TriggerConditionViewModelHarness condition;
-        condition.mockGameContext.SetNote({ 0x0099U }, L"Color {02=Red, 06=Brown}");
-        condition.mockConfiguration.SetFeatureEnabled(ra::services::Feature::PreferDecimal, true);
-        condition.Parse("0xH0099=2");
-
-        Assert::AreEqual(std::wstring(L"0x0099\r\nColor {02=Red, 06=Brown}"), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
-        Assert::AreEqual(std::wstring(L"02=Red"), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
-    }
-
     TEST_METHOD(TestTooltipValueHex)
     {
         TriggerConditionViewModelHarness condition;
@@ -795,6 +784,54 @@ TEST_CLASS(TriggerConditionViewModel_Tests)
         Assert::AreEqual(std::wstring(L"99"), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
     }
 
+    TEST_METHOD(TestTooltipValueEnumPreferDecimal)
+    {
+        TriggerConditionViewModelHarness condition;
+        condition.mockGameContext.SetNote({ 0x0099U }, L"Color {20=Red, 24=Brown}");
+        condition.mockConfiguration.SetFeatureEnabled(ra::services::Feature::PreferDecimal, true);
+        condition.Parse("0xH0099=20");
+
+        Assert::AreEqual(std::wstring(L"20"), condition.GetTargetValue());
+        Assert::AreEqual(std::wstring(L"0x0099\r\nColor {20=Red, 24=Brown}"), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
+        Assert::AreEqual(std::wstring(L"20=Red"), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
+    }
+
+    TEST_METHOD(TestTooltipValueEnumPreferHex)
+    {
+        TriggerConditionViewModelHarness condition;
+        condition.mockGameContext.SetNote({ 0x0099U }, L"Color {20=Red, 24=Brown}");
+        condition.mockConfiguration.SetFeatureEnabled(ra::services::Feature::PreferDecimal, false);
+        condition.Parse("0xH0099=20");
+
+        Assert::AreEqual(std::wstring(L"0x14"), condition.GetTargetValue());
+        Assert::AreEqual(std::wstring(L"0x0099\r\nColor {20=Red, 24=Brown}"), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
+        Assert::AreEqual(std::wstring(L"20=Red"), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
+    }
+
+    TEST_METHOD(TestTooltipValueEnumPreferDecimalHexNote)
+    {
+        TriggerConditionViewModelHarness condition;
+        condition.mockGameContext.SetNote({ 0x0099U }, L"Color {0x14=Red, 0x18=Brown}");
+        condition.mockConfiguration.SetFeatureEnabled(ra::services::Feature::PreferDecimal, true);
+        condition.Parse("0xH0099=20");
+
+        Assert::AreEqual(std::wstring(L"20"), condition.GetTargetValue());
+        Assert::AreEqual(std::wstring(L"0x0099\r\nColor {0x14=Red, 0x18=Brown}"), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
+        Assert::AreEqual(std::wstring(L"0x14=Red"), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
+    }
+
+    TEST_METHOD(TestTooltipValueEnumPreferHexHexNote)
+    {
+        TriggerConditionViewModelHarness condition;
+        condition.mockGameContext.SetNote({ 0x0099U }, L"Color {0x14=Red, 0x18=Brown}");
+        condition.mockConfiguration.SetFeatureEnabled(ra::services::Feature::PreferDecimal, false);
+        condition.Parse("0xH0099=20");
+
+        Assert::AreEqual(std::wstring(L"0x14"), condition.GetTargetValue());
+        Assert::AreEqual(std::wstring(L"0x0099\r\nColor {0x14=Red, 0x18=Brown}"), condition.GetTooltip(TriggerConditionViewModel::SourceValueProperty));
+        Assert::AreEqual(std::wstring(L"0x14=Red"), condition.GetTooltip(TriggerConditionViewModel::TargetValueProperty));
+    }
+
 private:
     class IndirectAddressTriggerViewModelHarness : public TriggerViewModel
     {