AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wxOSX Retina fixes: size wxStaticBitmap and wxBitmapButton properly.

Browse Source 
The size is expressed in logical coordinates and needs to use bitmap's
scaled size, otherwise it would appear twice as large in both
dimensions.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75350 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2013-12-04 14:33:07 +00:00
parent 4156e1a5c9
commit b5e7f21065
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/generic/statbmpg.h
View File

@ -60,7 +60,7 @@ public:
private: private:
wxSize GetBitmapSize() wxSize GetBitmapSize()
{ {
return m_bitmap.IsOk() ? wxSize(m_bitmap.GetWidth(), m_bitmap.GetHeight()) return m_bitmap.IsOk() ? m_bitmap.GetScaledSize()
: wxSize(16, 16); // this is completely arbitrary : wxSize(16, 16); // this is completely arbitrary
} }

2
src/common/ctrlcmn.cpp
View File

@ -584,7 +584,7 @@ wxSize wxStaticBitmapBase::DoGetBestSize() const
wxSize best; wxSize best;
wxBitmap bmp = GetBitmap(); wxBitmap bmp = GetBitmap();
if ( bmp.IsOk() ) if ( bmp.IsOk() )
best = wxSize(bmp.GetWidth(), bmp.GetHeight()); best = bmp.GetScaledSize();
else else
// this is completely arbitrary // this is completely arbitrary
best = wxSize(16, 16); best = wxSize(16, 16);

2
src/osx/bmpbuttn_osx.cpp
View File

@ -66,7 +66,7 @@ wxSize wxBitmapButton::DoGetBestSize() const
if ( GetBitmapLabel().IsOk() ) if ( GetBitmapLabel().IsOk() )
{ {
best += GetBitmapLabel().GetSize(); best += GetBitmapLabel().GetScaledSize();
} }
return best; return best;