Merge branch 'develop-SWtest2' into develop-Mix4BEtest

CrimRecya · Jan 10, 2025 · 509fad8 · 509fad8
2 parents 21dcb29 + d1712bb
commit 509fad8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp b/src/Ext/Sidebar/SWSidebar/SWSidebarClass.cpp
@@ -133,16 +133,18 @@ void SWSidebarClass::SortButtons()
 	const int maximum = Phobos::UI::SuperWeaponSidebar_Max;
 	const int cameoHarfInterval = (Phobos::UI::SuperWeaponSidebar_CameoHeight - cameoHeight) / 2;
 	int location_Y = (DSurface::ViewBounds().Height - std::min(buttonCount, maximum) * Phobos::UI::SuperWeaponSidebar_CameoHeight) / 2;
-	Point2D location = { Phobos::UI::SuperWeaponSidebar_LeftOffset, location_Y };
-	location_Y -= cameoHarfInterval;
+	Point2D location = { Phobos::UI::SuperWeaponSidebar_LeftOffset, location_Y + cameoHarfInterval };
 	int rowIdx = 0, columnIdx = 0;
 
 	for (const auto button : vec_Buttons)
 	{
 		const auto column = columns[columnIdx];
 
 		if (rowIdx == 0)
-			column->SetPosition(location.X - Phobos::UI::SuperWeaponSidebar_LeftOffset, location.Y - (SideExt::ExtMap.Find(SideClass::Array->Items[ScenarioClass::Instance->PlayerSideIndex])->SuperWeaponSidebar_TopPCX.GetSurface() ? 20 : 0));
+		{
+			const auto pTopPCX = SideExt::ExtMap.Find(SideClass::Array->Items[ScenarioClass::Instance->PlayerSideIndex])->SuperWeaponSidebar_TopPCX.GetSurface();
+			column->SetPosition(location.X - Phobos::UI::SuperWeaponSidebar_LeftOffset, location_Y - (pTopPCX ? pTopPCX->GetHeight() : 0));
+		}
 
 		column->Buttons.emplace_back(button);
 		button->SetColumn(columnIdx);