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

Allow using wxBitmapBundle for wxButton bitmaps

Browse Source 
Take wxBitmapBundle in wxButton::SetBitmapLabel() and related functions
in order to be able to associate several bitmaps to be used in different
resolutions with the button, instead of just a single bitmap.
This commit is contained in:
Vadim Zeitlin
2021-10-10 19:32:43 +01:00
parent 2910327ef3
commit 4e5d2d97e2
36 changed files with 223 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qt/anybutton.cpp
View File

@@ -90,10 +90,15 @@ void wxAnyButton::QtCreate(wxWindow *parent)
m_qtPushButton->setAutoDefault(false);
}
void wxAnyButton::QtSetBitmap( const wxBitmap &bitmap )
void wxAnyButton::QtSetBitmap( const wxBitmapBundle &bitmapBundle )
{
wxCHECK_RET(m_qtPushButton, "Invalid button.");
if ( !bitmapBundle.IsOk() )
return;
wxBitmap bitmap = bitmapBundle.GetBitmap(bitmapBundle.GetDefaultSize()*GetDPIScaleFactor());
// load the bitmap and resize the button:
QPixmap *pixmap = bitmap.GetHandle();
if ( pixmap != NULL )
@@ -117,10 +122,10 @@ QWidget *wxAnyButton::GetHandle() const
wxBitmap wxAnyButton::DoGetBitmap(State state) const
{
return state < State_Max ? m_bitmaps[state] : wxNullBitmap;
return state < State_Max ? m_bitmaps[state].GetBitmap(wxDefaultSize) : wxNullBitmap;
}
void wxAnyButton::DoSetBitmap(const wxBitmap& bitmap, State which)
void wxAnyButton::DoSetBitmap(const wxBitmapBundle& bitmap, State which)
{
wxCHECK_RET(which < State_Max, "Invalid state");
@@ -166,7 +171,7 @@ void wxAnyButton::QtUpdateState()
State state = QtGetCurrentState();
// Update the bitmap
const wxBitmap& bmp = m_bitmaps[state];
const wxBitmapBundle& bmp = m_bitmaps[state];
QtSetBitmap(bmp.IsOk() ? bmp : m_bitmaps[State_Normal]);
}