zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-07-21 15:30:33 +00:00
Code Activity

fix: apply menu item origin as an offset (#917)

Browse Source 
Add `origin` values to the existing item rectangle instead of replacing its coordinates.
This commit is contained in:
mo
2026-07-19 21:32:10 +02:00
committed by GitHub
parent 786ccc14d3
commit 9c56a28ef4
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ObjLoading/Parsing/Menu/Sequence/ItemScopeSequences.cpp
+2 -2
View File
@@ -255,8 +255,8 @@ namespace menu::item_scope_sequences
{ {
assert(state->m_current_item); assert(state->m_current_item);
state->m_current_item->m_rect.x = MenuMatcherFactory::TokenNumericExpressionValue(state, result); state->m_current_item->m_rect.x += MenuMatcherFactory::TokenNumericExpressionValue(state, result);
state->m_current_item->m_rect.y = MenuMatcherFactory::TokenNumericExpressionValue(state, result); state->m_current_item->m_rect.y += MenuMatcherFactory::TokenNumericExpressionValue(state, result);
} }
}; };
test/ObjLoadingTests/Parsing/Menu/Sequence/ItemScopeSequencesTests.cpp
+8 -7
View File
@@ -303,10 +303,11 @@ namespace test::parsing::menu::sequence::item
REQUIRE(item->m_rect.verticalAlign == 2); REQUIRE(item->m_rect.verticalAlign == 2);
} }
TEST_CASE("ItemScopeSequences: Can specify origin", "[parsing][sequence][menu]") TEST_CASE("ItemScopeSequences: Origin offsets the item rect", "[parsing][sequence][menu]")
{ {
ItemSequenceTestsHelper helper(FeatureLevel::IW4, false); ItemSequenceTestsHelper helper(FeatureLevel::IW4, false);
const TokenPos pos; const TokenPos pos;
helper.m_item->m_rect = CommonRect{10.0f, 20.0f, 30.0f, 40.0f, 1, 2};
helper.Tokens({ helper.Tokens({
SimpleParserValue::Identifier(pos, new std::string("origin")), SimpleParserValue::Identifier(pos, new std::string("origin")),
SimpleParserValue::FloatingPoint(pos, 4.20), SimpleParserValue::FloatingPoint(pos, 4.20),
@@ -326,12 +327,12 @@ namespace test::parsing::menu::sequence::item
const auto* item = helper.m_state->m_current_item; const auto* item = helper.m_state->m_current_item;
REQUIRE(item); REQUIRE(item);
REQUIRE_THAT(item->m_rect.x, WithinRel(4.20)); REQUIRE_THAT(item->m_rect.x, WithinRel(14.20));
REQUIRE_THAT(item->m_rect.y, WithinRel(13.37)); REQUIRE_THAT(item->m_rect.y, WithinRel(33.37));
REQUIRE_THAT(item->m_rect.w, WithinRel(0.0)); REQUIRE_THAT(item->m_rect.w, WithinRel(30.0));
REQUIRE_THAT(item->m_rect.h, WithinRel(0.0)); REQUIRE_THAT(item->m_rect.h, WithinRel(40.0));
REQUIRE(item->m_rect.horizontalAlign == 0); REQUIRE(item->m_rect.horizontalAlign == 1);
REQUIRE(item->m_rect.verticalAlign == 0); REQUIRE(item->m_rect.verticalAlign == 2);
} }
TEST_CASE("ItemScopeSequences: Ownerdraw sets the ownerdraw item type", "[parsing][sequence][menu]") TEST_CASE("ItemScopeSequences: Ownerdraw sets the ownerdraw item type", "[parsing][sequence][menu]")