From e1f7fa7bfb779fec7fedcec022d8d7520318a9a8 Mon Sep 17 00:00:00 2001
From: Asdow <20314541+Asdow@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:36:57 +0200
Subject: [PATCH] Fix button glitches in widescreen UI (#125)

In widescreen strategic UI, team panel sort buttons would be hidden when transferring items to and fro merc inventory via CTRL + left click
Exit inventory panel button should always be disabled in widescreen UI
---
 Strategic/Map Screen Interface Bottom.cpp | 2 +-
 Strategic/mapscreen.cpp                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp
index 7b975bb8..cf1ffd2e 100644
--- a/Strategic/Map Screen Interface Bottom.cpp	
+++ b/Strategic/Map Screen Interface Bottom.cpp	
@@ -1292,7 +1292,7 @@ void EnableDisableBottomButtonsAndRegions( void )
 		{
 			DisableButton( giMapInvDoneButton );
 		}
-		else
+		else if (!isWidescreenUI())
 		{
 			EnableButton( giMapInvDoneButton );
 		}
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index 78dbc250..dd9a1381 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -5708,7 +5708,7 @@ UINT32 MapScreenHandle(void)
 		HandleCharBarRender( );
 	}
 
-	if( fShowInventoryFlag || fDisableDueToBattleRoster )
+	if( (fShowInventoryFlag && !isWidescreenUI()) || fDisableDueToBattleRoster )
 	{
 		for( iCounter = 0; iCounter < MAX_SORT_METHODS; iCounter++ )
 		{
@@ -17968,4 +17968,4 @@ void initMapViewAndBorderCoordinates(void)
 		UI_MAP.HeliETA.Upper_Popup_Y = (50 + iScreenHeightOffset - 100);
 		UI_MAP.HeliETA.Alternate_Height = 97;
 	}
-}
\ No newline at end of file
+}