UI: Fix icon offset issues in Game List with wxWidget 3.3.0

dependencies/vcpkg_overlay_ports/wxwidgets/fix-dark-mode-offset.patch

@@ -0,0 +1,25 @@
+diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp
+index 2b9e0d7f7e..7eab8b37df 100644
+--- a/src/msw/listctrl.cpp
++++ b/src/msw/listctrl.cpp
+@@ -3110,6 +3110,11 @@ bool HandleSubItemPrepaint(wxListCtrl* listctrl, LPNMLVCUSTOMDRAW pLVCD, HFONT h
+
+         if ( it.iImage != -1 )
+         {
++            if ( !listctrl->HasCheckBoxes() )
++            {
++                rc.left -= 6;
++            }
++
+             const int yImage = rc.top + ((rc.bottom - rc.top) / 2 - hImage / 2);
+             ImageList_Draw(himl, it.iImage, hdc, rc.left, yImage,
+                            nmcd.uItemState & CDIS_SELECTED ? ILD_SELECTED
+@@ -3235,7 +3240,7 @@ void HandleItemPaint(wxListCtrl* listctrl, LPNMLVCUSTOMDRAW pLVCD, HFONT hfont)
+         // do not draw item background colour under the checkbox/image
+         RECT rcIcon;
+         wxGetListCtrlItemRect(nmcd.hdr.hwndFrom, nmcd.dwItemSpec, LVIR_ICON, rcIcon);
+-        if ( !::IsRectEmpty(&rcIcon) )
++        if ( !::IsRectEmpty(&rcIcon) && listctrl->HasCheckBoxes() )
+             rc.left = rcIcon.right + listctrl->FromDIP(GAP_BETWEEN_CHECKBOX_AND_TEXT);
+     }
+

dependencies/vcpkg_overlay_ports/wxwidgets/portfile.cmake

@@ -12,6 +12,7 @@ vcpkg_from_github(
         fix-pcre2.patch
         gtk3-link-libraries.patch
         sdl2.patch
+        fix-dark-mode-offset.patch
 )
 
 vcpkg_check_features(

src/gui/wxgui/components/wxGameList.cpp

@@ -140,32 +140,33 @@ wxGameList::wxGameList(wxWindow* parent, wxWindowID id)
 {
 	const auto& config = GetWxGUIConfig();
 
+	char transparent_bitmap[kIconWidth * kIconWidth * 4] = {wxIMAGE_ALPHA_TRANSPARENT};
+	memset((void*)transparent_bitmap, wxIMAGE_ALPHA_TRANSPARENT, sizeof(transparent_bitmap));
+	wxBitmap blank(transparent_bitmap, kIconWidth, kIconWidth);
+	blank.UseAlpha(true);
+
+	m_image_list_data = {};
+	m_image_list_data.emplace_back(wxBitmapBundle::FromBitmap(blank));
+	wxListCtrl::SetNormalImages(m_image_list_data);
+
+	m_image_list_small_data = {};
+	wxBitmap::Rescale(blank, {kListIconWidth, kListIconWidth});
+	m_image_list_small_data.emplace_back(wxBitmapBundle::FromBitmap(blank));
+	wxListCtrl::SetSmallImages(m_image_list_small_data);
+
 	InsertColumn(ColumnHiddenName, "", wxLIST_FORMAT_LEFT, 0);
 	if(config.show_icon_column)
-		InsertColumn(ColumnIcon, _("Icon"), wxLIST_FORMAT_LEFT, kListIconWidth);
+		InsertColumn(ColumnIcon, _("Icon"), wxLIST_FORMAT_LEFT, GetColumnDefaultWidth(ColumnIcon));
 	else
 		InsertColumn(ColumnIcon, _("Icon"), wxLIST_FORMAT_LEFT, 0);
 	InsertColumn(ColumnName, _("Game"), wxLIST_FORMAT_LEFT, config.column_width.name);
-	InsertColumn(ColumnVersion, _("Version"), wxLIST_FORMAT_RIGHT, config.column_width.version);
+	InsertColumn(ColumnVersion, _("Version"), wxLIST_FORMAT_LEFT, config.column_width.version);
-	InsertColumn(ColumnDLC, _("DLC"), wxLIST_FORMAT_RIGHT, config.column_width.dlc);
+	InsertColumn(ColumnDLC, _("DLC"), wxLIST_FORMAT_LEFT, config.column_width.dlc);
 	InsertColumn(ColumnGameTime, _("You've played"), wxLIST_FORMAT_LEFT, config.column_width.game_time);
 	InsertColumn(ColumnGameStarted, _("Last played"), wxLIST_FORMAT_LEFT, config.column_width.game_started);
 	InsertColumn(ColumnRegion, _("Region"), wxLIST_FORMAT_LEFT, config.column_width.region);
     InsertColumn(ColumnTitleID, _("Title ID"), wxLIST_FORMAT_LEFT, config.column_width.title_id);
 
-	const char transparent_bitmap[kIconWidth * kIconWidth * 4] = {0};
-	wxBitmap blank(transparent_bitmap, kIconWidth, kIconWidth);
-	blank.UseAlpha(true);
-
-	m_image_list = new wxImageList(kIconWidth, kIconWidth);
-	m_image_list->Add(blank);
-	wxListCtrl::SetImageList(m_image_list, wxIMAGE_LIST_NORMAL);
-
-	m_image_list_small = new wxImageList(kListIconWidth, kListIconWidth);
-	wxBitmap::Rescale(blank, {kListIconWidth, kListIconWidth});
-	m_image_list_small->Add(blank);
-	wxListCtrl::SetImageList(m_image_list_small, wxIMAGE_LIST_SMALL);
-
 	m_tooltip_window = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER);
 	auto* tooltip_sizer = new wxBoxSizer(wxVERTICAL);
 	tooltip_sizer->Add(new wxStaticText(m_tooltip_window, wxID_ANY, _("This game entry seems to be either an update or the base game was merged with update data\nBroken game dumps cause various problems during emulation and may even stop working at all in future Cemu versions\nPlease make sure the base game is intact and install updates only with the File->Install Update/DLC option")), 0, wxALL, 5);
@@ -210,10 +211,6 @@ wxGameList::~wxGameList()
 	m_async_task_count.increment();
 	m_async_worker_thread.join();
 
-	// destroy image lists
-	delete m_image_list;
-	delete m_image_list_small;
-
 	// clear image cache
 	m_icon_cache_mtx.lock();
 	m_icon_cache.clear();
@@ -306,6 +303,12 @@ int wxGameList::GetColumnDefaultWidth(int column)
 	switch (column)
 	{
 	case ColumnIcon:
+#if __WXMSW__
+		// note: this is another workaround that could be used to fix the icon offset, but instead of this there's a vcpkg patch for wxWidgets that fixes the icon offset
+		// wxWidgets offsets the icon in the REPORT view so it's cut off if the column width is set to 64px, see https://github.com/wxWidgets/wxWidgets/blob/09f433faf39aab3f25b3c564b82448bb845fae56/src/msw/listctrl.cpp#L3091
+		// so add 6px to the column width to compensate, and add another 6px to the right side so that it has equal whitespace on both sides
+		// return kListIconWidth + 6 + 6;
+#endif
 		return kListIconWidth;
 	case ColumnName:
 		return DefaultColumnSize::name;
@@ -408,10 +411,11 @@ void wxGameList::SetStyle(Style style, bool save)
 	switch(style)
 	{
 	case Style::kIcons:
-		wxListCtrl::SetImageList(m_image_list, wxIMAGE_LIST_NORMAL);
+		wxListCtrl::SetNormalImages(m_image_list_data);
 		break;
 	case Style::kSmallIcons:
-		wxListCtrl::SetImageList(m_image_list_small, wxIMAGE_LIST_NORMAL);
+	case Style::kList:
+		wxListCtrl::SetSmallImages(m_image_list_small_data);
 		break;
 	}
 
@@ -440,14 +444,14 @@ long wxGameList::GetStyleFlags(Style style) const
 	switch (style)
 	{
 	case Style::kList:
-		return (wxLC_SINGLE_SEL | wxLC_REPORT);
+		return (wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_VRULES);
 	case Style::kIcons:
 		return (wxLC_SINGLE_SEL | wxLC_ICON);
 	case Style::kSmallIcons:
 		return (wxLC_SINGLE_SEL | wxLC_ICON);
 	default:
 		wxASSERT(false);
-		return (wxLC_SINGLE_SEL | wxLC_REPORT);
+		return (wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_VRULES);
 	}
 }
 
@@ -464,7 +468,7 @@ void wxGameList::UpdateItemColors(sint32 startIndex)
 		if (GetConfig().IsGameListFavorite(titleId))
 		{
 			SetItemBackgroundColour(i, kFavoriteColor);
-			SetItemTextColour(i, 0x000000UL);
+			SetItemTextColour(i, wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 		}
 		else if ((i&1) != 0)
 		{
@@ -809,33 +813,34 @@ void wxGameList::OnContextMenuSelected(wxCommandEvent& event)
             }
             case kContextMenuCopyTitleName:
             {
-                if (wxTheClipboard->Open())
+                if (wxClipboard::Get()->Open())
                 {
-                    wxTheClipboard->SetData(new wxTextDataObject(wxString::FromUTF8(gameInfo.GetTitleName())));
+                    wxClipboard::Get()->SetData(new wxTextDataObject(wxString::FromUTF8(gameInfo.GetTitleName())));
-                    wxTheClipboard->Close();
+                    wxClipboard::Get()->Close();
                 }
                 break;
             }
             case kContextMenuCopyTitleId:
             {
-                if (wxTheClipboard->Open())
+                if (wxClipboard::Get()->Open())
                 {
-                    wxTheClipboard->SetData(new wxTextDataObject(fmt::format("{:016x}", gameInfo.GetBaseTitleId())));
+                    wxClipboard::Get()->SetData(new wxTextDataObject(fmt::format("{:016x}", gameInfo.GetBaseTitleId())));
-                    wxTheClipboard->Close();
+                    wxClipboard::Get()->Close();
                 }
                 break;
             }
             case kContextMenuCopyTitleImage:
             {
-                if (wxTheClipboard->Open())
+                if (wxClipboard::Get()->Open())
                 {
                     int icon_large;
                     int icon_small;
                     if (!QueryIconForTitle(title_id, icon_large, icon_small))
                         break;
-                    auto icon = m_image_list->GetBitmap(icon_large);
+                    auto icon = m_image_list_data[icon_large];
-                    wxTheClipboard->SetData(new wxBitmapDataObject(icon));
+                	auto newClipboardData = wxBitmapDataObject(icon.GetBitmap(icon.GetDefaultSize()));
-                    wxTheClipboard->Close();
+                    wxClipboard::Get()->SetData(&newClipboardData);
+                    wxClipboard::Get()->Close();
                 }
                 break;
             }
@@ -994,7 +999,7 @@ void wxGameList::ApplyGameListColumnWidths()
 	const auto& config = GetWxGUIConfig();
 	wxWindowUpdateLocker lock(this);
 	if(config.show_icon_column)
-		SetColumnWidth(ColumnIcon, kListIconWidth);
+		SetColumnWidth(ColumnIcon, GetColumnDefaultWidth(ColumnIcon));
 	else
 		SetColumnWidth(ColumnIcon, 0);
 	SetColumnWidth(ColumnName, config.column_width.name);
@@ -1109,6 +1114,23 @@ void wxGameList::OnGameEntryUpdatedByTitleId(wxTitleIdEvent& event)
 	TitleId baseTitleId = gameInfo.GetBaseTitleId();
 	bool isNewEntry = false;
 
+	if (m_style == Style::kIcons)
+	{
+		wxListCtrl::SetNormalImages(m_image_list_data);
+	}
+	else if (m_style == Style::kSmallIcons)
+	{
+		wxListCtrl::SetSmallImages(m_image_list_small_data);
+	}
+	else if (m_style == Style::kList)
+	{
+		wxListCtrl::SetSmallImages(m_image_list_small_data);
+	}
+
+	int icon = -1; /* 0 is the default empty icon */
+	int icon_small = -1; /* 0 is the default empty icon */
+	QueryIconForTitle(baseTitleId, icon, icon_small);
+
 	auto index = FindListItemByTitleId(baseTitleId);
 	if(index == wxNOT_FOUND)
 	{
@@ -1118,10 +1140,6 @@ void wxGameList::OnGameEntryUpdatedByTitleId(wxTitleIdEvent& event)
 		isNewEntry = true;
 	}
 
-	int icon = 0; /* 0 is the default empty icon */
-	int icon_small = 0; /* 0 is the default empty icon */
-	QueryIconForTitle(baseTitleId, icon, icon_small);
-
 	if (m_style == Style::kList)
 	{
 		SetItemColumnImage(index, ColumnIcon, icon_small);
@@ -1324,17 +1342,18 @@ void wxGameList::AsyncWorkerThread()
 			wxMemoryInputStream tmp_stream(tgaData->data(), tgaData->size());
 			const wxImage image(tmp_stream);
 			// todo - is wxImageList thread safe?
-			int icon = m_image_list->Add(image.Scale(kIconWidth, kIconWidth, wxIMAGE_QUALITY_BICUBIC));
+			m_image_list_data.emplace_back(image.Scale(kIconWidth, kIconWidth, wxIMAGE_QUALITY_BICUBIC));
-			int icon_small = m_image_list_small->Add(image.Scale(kListIconWidth, kListIconWidth, wxIMAGE_QUALITY_BICUBIC));
+			m_image_list_small_data.emplace_back(image.Scale(kListIconWidth, kListIconWidth, wxIMAGE_QUALITY_BICUBIC));
 			// store in cache
 			m_icon_cache_mtx.lock();
-			m_icon_cache.try_emplace(titleId, icon, icon_small);
+			m_icon_cache.try_emplace(titleId, m_image_list_data.size() - 1, m_image_list_small_data.size() - 1);
 			m_icon_cache_mtx.unlock();
 			iconSuccessfullyLoaded = true;
 		}
 		else
 		{
 			cemuLog_log(LogType::Force, "Failed to load icon for title {:016x}", titleId);
+			cemu_assert_debug(false);
 		}
 		titleInfo.Unmount(tempMountPath);
 		// notify UI about loaded icon
@@ -1609,19 +1628,14 @@ void wxGameList::CreateShortcut(GameInfo2& gameInfo)
 			cemuLog_log(LogType::Force, "Icon hasn't loaded");
 			return;
 		}
-		const auto icon = m_image_list->GetIcon(iconIdx);
+		const auto icon = m_image_list_data[iconIdx];
 		const auto folder = ActiveSettings::GetUserDataPath("icons");
 		if (!fs::exists(folder) && !fs::create_directories(folder))
 		{
 			cemuLog_log(LogType::Force, "Failed to create icon directory");
 			return;
 		}
-		wxBitmap bitmap{};
+		wxBitmap bitmap{icon.GetBitmap(wxDefaultSize)};
-		if (!bitmap.CopyFromIcon(icon))
-		{
-			cemuLog_log(LogType::Force, "Failed to copy icon");
-			return;
-		}
 
 		icon_path = folder / fmt::format("{:016x}.ico", titleId);
 		auto stream = wxFileOutputStream(icon_path->wstring());

src/gui/wxgui/components/wxGameList.h

@@ -63,9 +63,9 @@ private:
 	Style m_style;
 	long GetStyleFlags(Style style) const;
 
-	inline static const wxColour kUpdateColor{ 0x3939c3 };
+	const wxColour kUpdateColor{ wxSystemSettings::SelectLightDark(wxColour(195, 57, 57), wxColour(84, 29, 29)) };
-	inline static const wxColour kFavoriteColor{ 0xD3F6FD };
+	const wxColour kFavoriteColor{ wxSystemSettings::SelectLightDark(wxColour(253, 246, 211), wxColour(79, 76, 10)) };
-	inline static const wxColour kSecondColor{ 0xFDF9F2 };
+	const wxColour kSecondColor{ wxSystemSettings::SelectLightDark(wxColour(242, 249, 253), wxColour(34, 34, 34)) };
 	void UpdateItemColors(sint32 startIndex = 0);
 
 	enum ItemColumns : int
@@ -121,7 +121,7 @@ private:
 
 	inline static constexpr int kListIconWidth = 64;
 	inline static constexpr int kIconWidth = 128;
-	wxImageList* m_image_list, *m_image_list_small;
+	wxWithImages::Images m_image_list_data, m_image_list_small_data;
 
 	std::mutex m_icon_cache_mtx;
 	std::set<TitleId> m_icon_loaded;