temp

fortressforever · Nov 8, 2020 · 53a1da7 · 53a1da7
1 parent 7e37afc
commit 53a1da7
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/cl_dll/ff/vgui/ff_quantityitem.cpp b/cl_dll/ff/vgui/ff_quantityitem.cpp
@@ -219,8 +219,8 @@ namespace vgui
 
 			RecalculateIconPosition();
 			RecalculateLabelPosition();
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 			RecalculatePaintOffset();
 		}
 	}
@@ -426,8 +426,8 @@ namespace vgui
 		if(bHasChanged)
 		{
 			RecalculateAmountFont();
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -466,8 +466,8 @@ namespace vgui
 		if(bHasChanged)
 		{
 			RecalculateAmountFont();
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -563,8 +563,8 @@ namespace vgui
 		{
 			RecalculateIconPosition();
 			RecalculateLabelPosition();
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -578,8 +578,8 @@ namespace vgui
 		{
 			RecalculateIconPosition();
 			RecalculateLabelPosition();
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -843,8 +843,8 @@ namespace vgui
 
 		if(bHasChanged)
 		{
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -856,8 +856,8 @@ namespace vgui
 
 		if(bHasChanged)
 		{
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -920,8 +920,8 @@ namespace vgui
 
 		if (bHasChanged)
 		{
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -957,8 +957,8 @@ namespace vgui
 
 		if (bHasChanged)
 		{
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -994,8 +994,8 @@ namespace vgui
 
 		if (bHasChanged)
 		{
-			RecalculateAmountPosition();
 			RecalculateAmountMaxPosition();
+			RecalculateAmountPosition();
 		}
 
 		return bHasChanged;
@@ -1615,15 +1615,6 @@ namespace vgui
 		m_iLabelPosY = m_iLabelAnchorPositionY + m_iLabelAlignmentOffsetY + m_iLabelPositionOffsetY * m_flScaleY;
 	}
 
-	void FFQuantityItem::RecalculateAmountPosition()
-	{
-		CalculateTextPositionOffset(m_iAmountAnchorPositionX, m_iAmountAnchorPositionY, m_iAmountAnchorPosition);
-		CalculateTextAlignmentOffset(m_iAmountAlignmentOffsetX, m_iAmountAlignmentOffsetY, m_iAmountWidth, m_iAmountHeight, m_iAmountAlignHoriz, m_iAmountAlignVert, m_hfAmount, m_wszAmountString);
-
-		m_iAmountPosX = m_iAmountAnchorPositionX + m_iAmountAlignmentOffsetX + m_iAmountPositionOffsetX * m_flScaleX;
-		m_iAmountPosY = m_iAmountAnchorPositionY + m_iAmountAlignmentOffsetY + m_iAmountPositionOffsetY * m_flScaleY;
-	}
-
 	void FFQuantityItem::RecalculateAmountMaxPosition()
 	{
 		wchar_t wszMaxAmountString[ 10 ];
@@ -1644,6 +1635,14 @@ namespace vgui
 		m_iAmountMaxPosY = m_iAmountMaxAnchorPositionY + m_iAmountMaxAlignmentOffsetY + m_iAmountPositionOffsetY * m_flScaleY;
 	}
 
+	void FFQuantityItem::RecalculateAmountPosition()
+	{
+		CalculateAlignmentOffset(m_iAmountAnchorPositionX, m_iAmountAnchorPositionY, m_iAmountMaxWidth, m_iAmountMaxHeight, ALIGN_RIGHT, ALIGN_MIDDLE);
+
+		m_iAmountPosX = m_iAmountMaxPosX + m_iAmountAnchorPositionX;
+		m_iAmountPosY = m_iAmountMaxPosY + m_iAmountAnchorPositionY;
+	}
+
 	void FFQuantityItem::RecalculateQuantity( )
 	//all this regardless of whether each item is actually being shown
 	//(incase the user changes options during the game)