diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2017-06-02 18:44:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 18:44:48 -0700 |
| commit | 0b63fcc78f235c739cd2bcb93fde6a9d2c286af7 (patch) | |
| tree | e98fbe8589fa574f64aa9569a64377f46208b459 /Source | |
| parent | 93020f6c1b254bb50e94ae7d3901f789162fc745 (diff) | |
| parent | 1d8ba6f8655fe60a222bff3e66403bfe555f44d9 (diff) | |
Merge pull request #5505 from spycrab/wx_stars
Wx: Implement new, themed stars
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/GameListCtrl.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index 3ec0ed3d65..36d334fcbf 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -297,11 +297,14 @@ CGameListCtrl::~CGameListCtrl() template <typename T> static void InitBitmap(wxImageList* img_list, std::vector<int>* vector, wxWindow* context, - const wxSize& usable_size, T index, const std::string& name) + const wxSize& usable_size, T index, const std::string& name, + bool themed = false) { wxSize size = img_list->GetSize(); - (*vector)[static_cast<size_t>(index)] = img_list->Add(WxUtils::LoadScaledResourceBitmap( - name, context, size, usable_size, WxUtils::LSI_SCALE | WxUtils::LSI_ALIGN_VCENTER)); + auto bitmap_fnc = themed ? WxUtils::LoadScaledThemeBitmap : WxUtils::LoadScaledResourceBitmap; + (*vector)[static_cast<size_t>(index)] = img_list->Add( + bitmap_fnc(name, context, size, usable_size, WxUtils::LSI_SCALE | WxUtils::LSI_ALIGN_VCENTER, + wxTransparentColour)); } void CGameListCtrl::InitBitmaps() @@ -354,12 +357,12 @@ void CGameListCtrl::InitBitmaps() "Platform_File"); m_EmuStateImageIndex.resize(6); - InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 0, "rating0"); - InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 1, "rating1"); - InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 2, "rating2"); - InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 3, "rating3"); - InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 4, "rating4"); - InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 5, "rating5"); + InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 0, "rating0", true); + InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 1, "rating1", true); + InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 2, "rating2", true); + InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 3, "rating3", true); + InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 4, "rating4", true); + InitBitmap(img_list, &m_EmuStateImageIndex, this, rating_bmp_size, 5, "rating5", true); m_utility_game_banners.resize(1); InitBitmap(img_list, &m_utility_game_banners, this, size, 0, "nobanner"); |