From da3ac5c72ae6952ceaa294628559d7cbbf34f3f4 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Fri, 14 Feb 2014 16:18:18 -0500 Subject: [PATCH] MGR: If the desired icon size is missing use the next higher or lower one that is available. --- clientgui/BOINCTaskBar.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 3539143102..520d8ece0b 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -88,9 +88,9 @@ CTaskBarIcon::CTaskBarIcon(wxString title, wxIconBundle* icon, wxIconBundle* ico #endif { wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y)); - m_iconTaskBarNormal = icon->GetIcon(size); - m_iconTaskBarDisconnected = iconDisconnected->GetIcon(size); - m_iconTaskBarSnooze = iconSnooze->GetIcon(size); + m_iconTaskBarNormal = icon->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); + m_iconTaskBarDisconnected = iconDisconnected->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); + m_iconTaskBarSnooze = iconSnooze->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); m_SnoozeGPUMenuItem = NULL; m_bTaskbarInitiatedShutdown = false; @@ -351,9 +351,9 @@ void CTaskBarIcon::OnReloadSkin(CTaskbarEvent& WXUNUSED(event)) { wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced)); wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y)); - m_iconTaskBarNormal = pSkinAdvanced->GetApplicationIcon()->GetIcon(size); - m_iconTaskBarDisconnected = pSkinAdvanced->GetApplicationDisconnectedIcon()->GetIcon(size); - m_iconTaskBarSnooze = pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(size); + m_iconTaskBarNormal = pSkinAdvanced->GetApplicationIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); + m_iconTaskBarDisconnected = pSkinAdvanced->GetApplicationDisconnectedIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); + m_iconTaskBarSnooze = pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER); }