Use itemDrawArea in ProductListBox

Author: DanRStevens

appOPHD/UI/ProductListBox.cpp

@@ -67,31 +67,29 @@ void ProductListBox::update()
 
 	constexpr Color highlightColor{0, 185, 0, 75};
 
-	const auto itemSize = itemDrawSize();
-	const auto firstStop = itemSize.x / 3;
-	const auto secondStop = itemSize.x * 2 / 3;
-
 	for (std::size_t index = 0; index < mItems.size(); ++index)
 	{
-		const auto drawPosition = itemDrawPosition(index);
+		const auto drawArea = itemDrawArea(index);
 		const auto highlight = index == selectedIndex();
+		const auto firstStop = drawArea.size.x / 3;
+		const auto secondStop = drawArea.size.x * 2 / 3;
 		const auto& item = *static_cast<ProductListBoxItem*>(mItems[index]);
 
 		// Draw highlight rect so as not to tint/hue colors of everything else
-		if (highlight) { renderer.drawBoxFilled(NAS2D::Rectangle{drawPosition, itemSize}, highlightColor); }
+		if (highlight) { renderer.drawBoxFilled(drawArea, highlightColor); }
 
 		// Draw item borders and column breaks
-		renderer.drawBox(NAS2D::Rectangle{drawPosition, itemSize}.inset(2), constants::PrimaryColor);
-		renderer.drawLine(drawPosition + NAS2D::Vector{firstStop, 2}, drawPosition + NAS2D::Vector{firstStop, itemSize.y - 2}, constants::PrimaryColor);
-		renderer.drawLine(drawPosition + NAS2D::Vector{secondStop, 2}, drawPosition + NAS2D::Vector{secondStop, itemSize.y - 2}, constants::PrimaryColor);
+		renderer.drawBox(drawArea.inset(2), constants::PrimaryColor);
+		renderer.drawLine(drawArea.position + NAS2D::Vector{firstStop, 2}, drawArea.position + NAS2D::Vector{firstStop, drawArea.size.y - 2}, constants::PrimaryColor);
+		renderer.drawLine(drawArea.position + NAS2D::Vector{secondStop, 2}, drawArea.position + NAS2D::Vector{secondStop, drawArea.size.y - 2}, constants::PrimaryColor);
 
 		// Draw item column contents
-		renderer.drawText(mFontBold, item.text, drawPosition + NAS2D::Vector{5, 15 - mFontBold.height() / 2}, constants::PrimaryColor);
-		renderer.drawText(mFont, "Quantity: " + std::to_string(item.count), drawPosition + NAS2D::Vector{firstStop + 5, 15 - mFontBold.height() / 2}, constants::PrimaryColor);
+		renderer.drawText(mFontBold, item.text, drawArea.position + NAS2D::Vector{5, 15 - mFontBold.height() / 2}, constants::PrimaryColor);
+		renderer.drawText(mFont, "Quantity: " + std::to_string(item.count), drawArea.position + NAS2D::Vector{firstStop + 5, 15 - mFontBold.height() / 2}, constants::PrimaryColor);
 		drawProgressBar(
 			item.capacityUsed,
 			item.capacityTotal,
-			{drawPosition + NAS2D::Vector{secondStop + 5, 10}, {firstStop - 10, 10}},
+			{drawArea.position + NAS2D::Vector{secondStop + 5, 10}, {firstStop - 10, 10}},
 			2
 		);
 	}