X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdccdfabb29bd51aded9aac141e1f7bbd6c85443..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/mac/carbon/bmpbuttn.cpp?ds=inline diff --git a/src/mac/carbon/bmpbuttn.cpp b/src/mac/carbon/bmpbuttn.cpp index 2df9569de4..aae979a862 100644 --- a/src/mac/carbon/bmpbuttn.cpp +++ b/src/mac/carbon/bmpbuttn.cpp @@ -6,7 +6,7 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" @@ -16,13 +16,69 @@ #include "wx/bmpbuttn.h" #ifndef WX_PRECOMP - #include "wx/window.h" + #include "wx/dcmemory.h" #endif IMPLEMENT_DYNAMIC_CLASS(wxBitmapButton, wxButton) #include "wx/mac/uma.h" -#include "wx/bitmap.h" + +//--------------------------------------------------------------------------- +// Helper functions + +static wxBitmap wxMakeStdSizeBitmap(const wxBitmap& bitmap) +{ + // in Mac OS X the icon controls (which are used for borderless bitmap + // buttons) can have only one of the few standard sizes and if they + // don't, the OS rescales them automatically resulting in really ugly + // images, so centre the image in a square of standard size instead + + // the supported sizes, sorted in decreasng order + static const int stdSizes[] = { 128, 48, 32, 16, 0 }; + + const int width = bitmap.GetWidth(); + const int height = bitmap.GetHeight(); + + wxBitmap newBmp(bitmap); + + int n; + for ( n = 0; n < (int)WXSIZEOF(stdSizes); n++ ) + { + const int sizeStd = stdSizes[n]; + if ( width > sizeStd || height > sizeStd ) + { + // it will become -1 if the bitmap is larger than the biggest + // supported size, this is intentional + n--; + + break; + } + } + + if ( n != -1 ) + { + const int sizeStd = stdSizes[n]; + if ( width != sizeStd || height != sizeStd ) + { + wxASSERT_MSG( width <= sizeStd && height <= sizeStd, + _T("bitmap shouldn't be cropped") ); + + newBmp.Create(sizeStd, sizeStd); + wxMemoryDC dcMem; + dcMem.SelectObject(newBmp); + dcMem.Clear(); + + dcMem.DrawBitmap(bitmap, + (sizeStd - width)/2, (sizeStd-height)/2, + true); + } + } + //else: let the system rescale the bitmap + + return newBmp; +} + +//--------------------------------------------------------------------------- bool wxBitmapButton::Create( wxWindow *parent, wxWindowID id, const wxBitmap& bitmap, @@ -39,8 +95,6 @@ bool wxBitmapButton::Create( wxWindow *parent, if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) ) return false; - m_bmpNormal = bitmap; - if ( style & wxBU_AUTODRAW ) { m_marginX = @@ -52,42 +106,33 @@ bool wxBitmapButton::Create( wxWindow *parent, m_marginY = 0; } - int width = size.x; - int height = size.y; - - if ( bitmap.Ok() ) - { - wxSize newSize = DoGetBestSize(); - if ( width == wxDefaultCoord ) - width = newSize.x; - if ( height == wxDefaultCoord ) - height = newSize.y; - } - - m_bmpNormal = bitmap; - OSStatus err = noErr; ControlButtonContentInfo info; Rect bounds = wxMacGetBoundsForControl( this, pos, size ); m_peer = new wxMacControl( this ); -#ifdef __WXMAC_OSX__ + if ( bitmap.Ok() && HasFlag(wxBORDER_NONE) ) + m_bmpNormal = wxMakeStdSizeBitmap(bitmap); + else + m_bmpNormal = bitmap; + + if ( HasFlag( wxBORDER_NONE ) ) { + // contrary to the docs this control only works with iconrefs wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef ); err = CreateIconControl( - MAC_WXHWND(parent->MacGetTopLevelWindowRef()), - &bounds, &info, false, m_peer->GetControlRefAddr() ); + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), + &bounds, &info, false, m_peer->GetControlRefAddr() ); } else -#endif { wxMacCreateBitmapButton( &info, m_bmpNormal ); err = CreateBevelButtonControl( - MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""), - ((style & wxBU_AUTODRAW) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ), - kControlBehaviorOffsetContents, &info, 0, 0, 0, m_peer->GetControlRefAddr() ); + MAC_WXHWND(parent->MacGetTopLevelWindowRef()), &bounds, CFSTR(""), + ((style & wxBU_AUTODRAW) ? kControlBevelButtonSmallBevel : kControlBevelButtonNormalBevel ), + kControlBehaviorOffsetContents, &info, 0, 0, 0, m_peer->GetControlRefAddr() ); } verify_noerr( err ); @@ -102,20 +147,22 @@ bool wxBitmapButton::Create( wxWindow *parent, void wxBitmapButton::SetBitmapLabel( const wxBitmap& bitmap ) { - m_bmpNormal = bitmap; + if ( HasFlag( wxBORDER_NONE ) ) + m_bmpNormal = wxMakeStdSizeBitmap(bitmap); + else + m_bmpNormal = bitmap; + InvalidateBestSize(); ControlButtonContentInfo info; -#ifdef __WXMAC_OSX__ if ( HasFlag( wxBORDER_NONE ) ) - { + { wxMacCreateBitmapButton( &info, m_bmpNormal, kControlContentIconRef ); if ( info.contentType != kControlNoContent ) m_peer->SetData( kControlIconPart, kControlIconContentTag, info ); } else -#endif { wxMacCreateBitmapButton( &info, m_bmpNormal ); if ( info.contentType != kControlNoContent )