Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected references to bitmap size in AUI and Ribbon to take scaling into account

Browse Source
This commit is contained in:
JulianSmart
2017-05-12 15:50:15 +01:00
parent 11f79cda31
commit c07b14332b
10 changed files with 101 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ribbon/panel.cpp
View File

@@ -692,11 +692,15 @@ bool wxRibbonPanel::Realize()
wxSize panel_min_size = GetMinNotMinimisedSize();
m_minimised_size = m_art->GetMinimisedPanelMinimumSize(temp_dc, this,
&bitmap_size, &m_preferred_expand_direction);
if(m_minimised_icon.IsOk() && m_minimised_icon.GetSize() != bitmap_size)
if(m_minimised_icon.IsOk() && m_minimised_icon.GetScaledSize() != bitmap_size)
{
double scale = m_minimised_icon.GetScaleFactor();
if (scale > 1.0)
scale = 2.0;
wxImage img(m_minimised_icon.ConvertToImage());
img.Rescale(bitmap_size.GetWidth(), bitmap_size.GetHeight(), wxIMAGE_QUALITY_HIGH);
m_minimised_icon_resized = wxBitmap(img);
img.Rescale(scale * bitmap_size.GetWidth(), scale * bitmap_size.GetHeight(), wxIMAGE_QUALITY_HIGH);
m_minimised_icon_resized = wxBitmap(img, -1, scale);
}
else
{