mirror of https://github.com/BOINC/boinc.git
MGR: If the desired icon size is missing use the next higher or lower one that is available.
This commit is contained in:
parent
95a45dee5a
commit
da3ac5c72a
|
@ -88,9 +88,9 @@ CTaskBarIcon::CTaskBarIcon(wxString title, wxIconBundle* icon, wxIconBundle* ico
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
|
wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
|
||||||
m_iconTaskBarNormal = icon->GetIcon(size);
|
m_iconTaskBarNormal = icon->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
|
||||||
m_iconTaskBarDisconnected = iconDisconnected->GetIcon(size);
|
m_iconTaskBarDisconnected = iconDisconnected->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
|
||||||
m_iconTaskBarSnooze = iconSnooze->GetIcon(size);
|
m_iconTaskBarSnooze = iconSnooze->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
|
||||||
m_SnoozeGPUMenuItem = NULL;
|
m_SnoozeGPUMenuItem = NULL;
|
||||||
|
|
||||||
m_bTaskbarInitiatedShutdown = false;
|
m_bTaskbarInitiatedShutdown = false;
|
||||||
|
@ -351,9 +351,9 @@ void CTaskBarIcon::OnReloadSkin(CTaskbarEvent& WXUNUSED(event)) {
|
||||||
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
|
wxASSERT(wxDynamicCast(pSkinAdvanced, CSkinAdvanced));
|
||||||
|
|
||||||
wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
|
wxSize size = wxSize(wxSystemSettings::GetMetric(wxSYS_SMALLICON_X), wxSystemSettings::GetMetric(wxSYS_SMALLICON_Y));
|
||||||
m_iconTaskBarNormal = pSkinAdvanced->GetApplicationIcon()->GetIcon(size);
|
m_iconTaskBarNormal = pSkinAdvanced->GetApplicationIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
|
||||||
m_iconTaskBarDisconnected = pSkinAdvanced->GetApplicationDisconnectedIcon()->GetIcon(size);
|
m_iconTaskBarDisconnected = pSkinAdvanced->GetApplicationDisconnectedIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
|
||||||
m_iconTaskBarSnooze = pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(size);
|
m_iconTaskBarSnooze = pSkinAdvanced->GetApplicationSnoozeIcon()->GetIcon(size, wxIconBundle::FALLBACK_NEAREST_LARGER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue