From 7a15b4eab879ffff8ac3954133ff7a0eac0f05ae Mon Sep 17 00:00:00 2001
From: Pablo Curiel <pabloacurielz@gmail.com>
Date: Wed, 23 Jun 2021 21:04:28 -0400
Subject: [PATCH] UserTitleTab: remove the need for a title ID map by extending
 the ListItem class.

Each ListItem element gets its own internal title ID.
---
 include/user_titles_tab.hpp | 11 ++++++++++-
 libs/borealis               |  2 +-
 source/user_titles_tab.cpp  | 23 +++++++----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/user_titles_tab.hpp b/include/user_titles_tab.hpp
index 83c3bf1..b7156fe 100644
--- a/include/user_titles_tab.hpp
+++ b/include/user_titles_tab.hpp
@@ -29,12 +29,21 @@
 
 namespace nxdt::views
 {
+    /* Expanded ListItem class to hold a title ID. */
+    class UserTitlesItem: public brls::ListItem
+    {
+        private:
+            u64 title_id = 0;
+        
+        public:
+            UserTitlesItem(TitleApplicationMetadata *app_metadata);
+    };
+    
     class UserTitlesTab: public LayeredErrorFrame
     {
         private:
             nxdt::tasks::TitleTask *title_task = nullptr;
             nxdt::tasks::TitleEvent::Subscription title_task_sub;
-            std::unordered_map<brls::ListItem*, TitleApplicationMetadata*> list_item_metadata;
             
             void PopulateList(const nxdt::tasks::TitleApplicationMetadataVector* user_app_metadata);
         
diff --git a/libs/borealis b/libs/borealis
index 053870c..7de1624 160000
--- a/libs/borealis
+++ b/libs/borealis
@@ -1 +1 @@
-Subproject commit 053870cd5e2402d180d858ca502fb90db6809279
+Subproject commit 7de16249a693e187e7249404d41e0da8a5572bf6
diff --git a/source/user_titles_tab.cpp b/source/user_titles_tab.cpp
index 3e334a4..9397994 100644
--- a/source/user_titles_tab.cpp
+++ b/source/user_titles_tab.cpp
@@ -26,6 +26,12 @@ using namespace brls::i18n::literals;   /* For _i18n. */
 
 namespace nxdt::views
 {
+    UserTitlesItem::UserTitlesItem(TitleApplicationMetadata *app_metadata) : brls::ListItem(std::string(app_metadata->lang_entry.name), "", std::string(app_metadata->lang_entry.author)), \
+                                                                             title_id(app_metadata->title_id)
+    {
+        if (app_metadata->icon && app_metadata->icon_size) this->setThumbnail(app_metadata->icon, app_metadata->icon_size);
+    }
+    
     UserTitlesTab::UserTitlesTab(nxdt::tasks::TitleTask *title_task) : LayeredErrorFrame("user_titles_tab/no_titles_available"_i18n), title_task(title_task)
     {
         /* Populate list. */
@@ -43,9 +49,6 @@ namespace nxdt::views
     {
         /* Unregister task listener. */
         this->title_task->UnregisterListener(this->title_task_sub);
-        
-        /* Clear user application metadata map. */
-        this->list_item_metadata.clear();
     }
     
     void UserTitlesTab::PopulateList(const nxdt::tasks::TitleApplicationMetadataVector* user_app_metadata)
@@ -78,23 +81,11 @@ namespace nxdt::views
         this->list->clear();
         this->list->invalidate(true);
         
-        /* Clear our private user application map. */
-        this->list_item_metadata.clear();
-        
         /* Immediately return if we have no user application metadata. */
         if (!user_app_metadata_count) return;
         
         /* Populate list. */
-        for(TitleApplicationMetadata *cur_app_metadata : *user_app_metadata)
-        {
-            /* Add list item for this application metadata to our list. */
-            brls::ListItem *list_item = new brls::ListItem(std::string(cur_app_metadata->lang_entry.name), "", std::string(cur_app_metadata->lang_entry.author));
-            list_item->setThumbnail(cur_app_metadata->icon, cur_app_metadata->icon_size);
-            this->list->addView(list_item);
-            
-            /* Update our private user application metadata map. */
-            this->list_item_metadata.insert(std::make_pair(list_item, cur_app_metadata));
-        }
+        for(TitleApplicationMetadata *cur_app_metadata : *user_app_metadata) this->list->addView(new UserTitlesItem(cur_app_metadata));
         
         /* Switch to the list. */
         this->list->invalidate(true);