UI tweaks

Author: Causeless

Source/GUI/GUIListPanel.cpp

@@ -329,15 +329,15 @@ void GUIListPanel::BuildDrawBitmap() {
 
 			// Draw the associated bitmap
 			if (I->m_pBitmap) {
-				if (bitmapWidth == thirdWidth) {
+				if (I->m_Name.empty()) {
+					// No text, just bitmap, so give it more room
+					I->m_pBitmap->DrawTrans(m_DrawBitmap, ((thirdWidth * 1.3f) - (bitmapWidth / 2)) - itemX + 4, bitmapY, 0);
+				} else if (bitmapWidth == thirdWidth) {
 					// If it was deemed too large, draw it scaled
 					I->m_pBitmap->DrawTransScaled(m_DrawBitmap, 3 - itemX, bitmapY, bitmapWidth, bitmapHeight);
-				} else if (!I->m_Name.empty()) {
+				} else {
 					// There's text to compete for space with
 					I->m_pBitmap->DrawTrans(m_DrawBitmap, ((thirdWidth / 2) - (bitmapWidth / 2)) - itemX + 2, bitmapY, 0);
-				} else {
-					// No text, just bitmap, so give it more room
-					I->m_pBitmap->DrawTrans(m_DrawBitmap, ((thirdWidth) - (bitmapWidth / 2)) - itemX + 4, bitmapY, 0);
 				}
 			}
 
@@ -991,10 +991,15 @@ GUIListPanel::Item* GUIListPanel::GetItem(int Index) {
 	if (Index >= 0 && Index < m_Items.size()) {
 		return m_Items.at(Index);
 	}
-	return 0;
+	return nullptr;
 }
 
 GUIListPanel::Item* GUIListPanel::GetItem(int X, int Y) {
+	// If outside of X bounds, return nothing
+	if (X < m_X || X >= m_X + m_Width) {
+		return nullptr;
+	}
+	
 	int Height = m_Height;
 	if (m_HorzScroll->_GetVisible()) {
 		Height -= m_HorzScroll->GetHeight();
@@ -1004,6 +1009,7 @@ GUIListPanel::Item* GUIListPanel::GetItem(int X, int Y) {
 	if (m_VertScroll->_GetVisible()) {
 		y -= m_VertScroll->GetValue();
 	}
+
 	int Count = 0;
 	for (std::vector<Item*>::iterator it = m_Items.begin(); it != m_Items.end(); it++, Count++) {
 		Item* pItem = *it;
@@ -1019,7 +1025,8 @@ GUIListPanel::Item* GUIListPanel::GetItem(int X, int Y) {
 			break;
 		}
 	}
-	return 0;
+
+	return nullptr;
 }
 
 int GUIListPanel::GetItemHeight(Item* pItem) {

Source/Menus/BuyMenuGUI.cpp

@@ -871,9 +871,9 @@ void BuyMenuGUI::Update() {
 	}
 
 	// Check if any direction has been held for the starting amount of time to get into repeat mode
-	if (m_RepeatStartTimer.IsPastRealMS(200)) {
+	if (m_RepeatStartTimer.IsPastRealMS(350)) {
 		// Check for the repeat interval
-		if (m_RepeatTimer.IsPastRealMS(75)) {
+		if (m_RepeatTimer.IsPastRealMS(125)) {
 			if (m_pController->IsState(MOVE_RIGHT)) {
 				pressRight = true;
 			} else if (m_pController->IsState(MOVE_LEFT)) {
@@ -2218,7 +2218,7 @@ void BuyMenuGUI::AddPresetsToItemList() {
 		AllegroBitmap* pItemBitmap = nullptr;
 		float loadoutCost = 0;
 
-		const int maxBitmapWidth = 100;
+		const int maxBitmapWidth = 130;
 
 		int bitmapHeight = 0;
 		int bitmapWidth = 0;