Add a UI button to delete servers from the "Recent" tab (#2253)

* add a UI button to remove any server from the "Recent" tab

* fix code style

* Tweak icon initial alpha

Co-authored-by: patrikjuvonen <22572159+patrikjuvonen@users.noreply.github.com>

Author: brenodanyel

Client/core/ServerBrowser/CServerBrowser.cpp

@@ -346,6 +346,17 @@ void CServerBrowser::CreateTab(ServerBrowserType type, const char* szName)
     m_pAddressFavoriteIcon[type]->LoadFromFile("cgui\\images\\serverbrowser\\favorite.png");
     m_pAddressFavoriteIcon[type]->SetAlpha(0.3f);
     m_pAddressFavoriteIcon[type]->SetClickHandler(GUI_CALLBACK(&CServerBrowser::OnFavouritesClick, this));
+    
+    // Remove recent played icon
+    if (type == ServerBrowserTypes::RECENTLY_PLAYED)
+    {
+        m_pRemoveFromRecentIcon[type] = reinterpret_cast<CGUIStaticImage*>(pManager->CreateStaticImage(m_pEditAddress[type]));
+        m_pRemoveFromRecentIcon[type]->SetPosition(CVector2D(fWidth - 40 - 8, (SB_BUTTON_SIZE_Y - 16) / 2), false);
+        m_pRemoveFromRecentIcon[type]->SetSize(CVector2D(16, 16), false);
+        m_pRemoveFromRecentIcon[type]->LoadFromFile("cgui\\images\\serverbrowser\\trashcan.png");
+        m_pRemoveFromRecentIcon[type]->SetAlpha(0.3f);
+        m_pRemoveFromRecentIcon[type]->SetClickHandler(GUI_CALLBACK(&CServerBrowser::OnRemoveFromRecentClick, this));
+    }
 
     // History Combo
     fWidth = fWidth + COMBOBOX_ARROW_SIZE_X;
@@ -593,6 +604,8 @@ void CServerBrowser::DeleteTab(ServerBrowserType type)
     delete m_pComboAddressHistory[type];
 
     delete m_pAddressFavoriteIcon[type];
+    if (type == ServerBrowserTypes::RECENTLY_PLAYED)
+        delete m_pRemoveFromRecentIcon[type];
     delete m_pEditSearch[type];
     delete m_pButtonRefreshIcon[type];
 
@@ -877,6 +890,9 @@ void CServerBrowser::UpdateServerList(ServerBrowserType Type, bool bClearServerL
 
     m_pServerList[Type]->ForceUpdate();
     pList->SetUpdated(false);
+    
+    if (Type == ServerBrowserTypes::RECENTLY_PLAYED)
+        m_pRemoveFromRecentIcon[Type]->SetAlpha(0.3f);
 }
 
 void CServerBrowser::CreateHistoryList()
@@ -1132,6 +1148,8 @@ bool CServerBrowser::RemoveSelectedServerFromRecentlyPlayedList()
     m_pServerList[Type]->RemoveRow(iSelectedItem);
     SaveRecentlyPlayedList();
 
+    m_pRemoveFromRecentIcon[Type]->SetAlpha(0.3f);
+
     return true;
 }
 
@@ -1223,6 +1241,14 @@ bool CServerBrowser::OnClick(CGUIElement* pElement)
 
         // save the selected server
         m_iSelectedServer[Type] = iSelectedIndex;
+
+        if (Type == ServerBrowserTypes::RECENTLY_PLAYED)
+            m_pRemoveFromRecentIcon[Type]->SetAlpha(1.0f);
+    }
+    else
+    {
+        if (Type == ServerBrowserTypes::RECENTLY_PLAYED)
+            m_pRemoveFromRecentIcon[Type]->SetAlpha(0.3f);
     }
     return true;
 }
@@ -1421,6 +1447,11 @@ bool CServerBrowser::OnFavouritesClick(CGUIElement* pElement)
     return true;
 }
 
+bool CServerBrowser::OnRemoveFromRecentClick(CGUIElement* pElement)
+{
+    return RemoveSelectedServerFromRecentlyPlayedList();
+}
+
 bool CServerBrowser::OnAddressChanged(CGUIElement* pElement)
 {
     unsigned short    usPort;

Client/core/ServerBrowser/CServerBrowser.h

@@ -163,6 +163,7 @@ class CServerBrowser : public CSingleton<CServerBrowser>
     CGUIComboBox*    m_pComboAddressHistory[SERVER_BROWSER_TYPE_COUNT];
     CGUIStaticImage* m_pSearchTypeIcon[SERVER_BROWSER_TYPE_COUNT];
     CGUIStaticImage* m_pAddressFavoriteIcon[SERVER_BROWSER_TYPE_COUNT];
+    CGUIStaticImage* m_pRemoveFromRecentIcon[SERVER_BROWSER_TYPE_COUNT];
 
     CGUIComboBox* m_pComboSearchType[SERVER_BROWSER_TYPE_COUNT];
     CGUIEdit*     m_pEditSearch[SERVER_BROWSER_TYPE_COUNT];
@@ -216,6 +217,7 @@ class CServerBrowser : public CSingleton<CServerBrowser>
     bool OnRefreshClick(CGUIElement* pElement);
     bool OnInfoClick(CGUIElement* pElement);
     bool OnFavouritesClick(CGUIElement* pElement);
+    bool OnRemoveFromRecentClick(CGUIElement* pElement);
     bool OnBackClick(CGUIElement* pElement);
     bool OnGeneralHelpClick(CGUIElement* pElement);
     bool OnGeneralHelpDeactivate(CGUIElement* pElement);