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

Update bitmap shown by the buttons in wxMSW on DPI change

Browse Source 
This was already done for buttons using wxXPButtonImageData to store the image data,
also do it for buttons that use wxODButtonImageData.
When the DPI changes, recreate the bitmaps with the size corresponding to the new DPI.

Move m_btn to wxButtonImageData so it can be used for both ImageData implementations.
This commit is contained in:
Maarten Bent 2021-12-23 21:05:17 +01:00
parent ee93f4cae8
commit 971e50a45c
1 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/msw/anybutton.cpp
View File

@ -106,14 +106,25 @@ class wxButtonImageData: public wxObject
{
public:
wxButtonImageData(wxWindow* btn, const wxBitmapBundle& normalBundle)
: m_btn(btn)
{
m_bitmapSize = normalBundle.GetPreferredSizeFor(btn);
m_bitmapBundles[wxAnyButton::State_Normal] = normalBundle;
// React to DPI changes in the future.
m_btn->Bind(wxEVT_DPI_CHANGED, &wxButtonImageData::OnDPIChanged, this);
}
virtual ~wxButtonImageData() { }
virtual void OnDPIChanged(wxDPIChangedEvent& event)
{
event.Skip();
m_bitmapSize = m_bitmapBundles[wxAnyButton::State_Normal].GetPreferredSizeFor(m_btn);
}
// Bitmap can be set either explicitly, when the bitmap for the given state
// is specified by the application, or implicitly, when the bitmap for some
// state is set as a side effect of setting another bitmap.
@ -165,6 +176,9 @@ protected:
wxBitmapBundle m_bitmapBundles[wxAnyButton::State_Max];
// the button we're associated with
wxWindow* const m_btn;
wxDECLARE_NO_COPY_CLASS(wxButtonImageData);
};
@ -246,6 +260,13 @@ private:
}
}
void OnDPIChanged(wxDPIChangedEvent& event) wxOVERRIDE
{
wxButtonImageData::OnDPIChanged(event);
InitImageList();
}
// just store the values passed to us to be able to retrieve them later
// from the drawing code
wxBitmap m_bitmaps[wxAnyButton::State_Max];
@ -270,8 +291,7 @@ public:
// we must be constructed with the size of our images as we need to create
// the image list
wxXPButtonImageData(wxAnyButton *btn, const wxBitmapBundle& bitmapBundle)
: wxButtonImageData(btn, bitmapBundle),
m_btn(btn)
: wxButtonImageData(btn, bitmapBundle)
{
InitImageList();
@ -282,9 +302,6 @@ public:
m_data.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT;
UpdateImageInfo();
// React to DPI changes in the future.
btn->Bind(wxEVT_DPI_CHANGED, &wxXPButtonImageData::OnDPIChanged, this);
}
virtual wxBitmap GetBitmap(wxAnyButton::State which) const wxOVERRIDE
@ -426,13 +443,9 @@ private:
}
}
void OnDPIChanged(wxDPIChangedEvent& event)
void OnDPIChanged(wxDPIChangedEvent& event) wxOVERRIDE
{
event.Skip();
// We need to recreate the image list using the new size and re-add all
// bitmaps to it.
m_bitmapSize = m_bitmapBundles[wxAnyButton::State_Normal].GetPreferredSizeFor(m_btn);
wxButtonImageData::OnDPIChanged(event);
m_iml.Destroy();
InitImageList();
@ -447,10 +460,6 @@ private:
// store the rest of the data in BCM_SETIMAGELIST-friendly form
BUTTON_IMAGELIST m_data;
// the button we're associated with
wxWindow* const m_btn;
wxDECLARE_NO_COPY_CLASS(wxXPButtonImageData);
wxDECLARE_ABSTRACT_CLASS(wxXPButtonImageData);
};