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

Move creating custom bitmaps of wxGenericColourDialog into separate function

Browse Source
This commit is contained in:
Maarten Bent
2020-07-31 00:06:35 +02:00
parent a54b4073f9
commit 9e2615ac06
2 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/generic/colrdlgg.h
View File

@@ -79,6 +79,7 @@ public:
void OnCloseWindow(wxCloseEvent& event);
#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
virtual void CreateCustomBitmaps();
void DoPreviewBitmap(wxBitmap& bmp, const wxColour& colour);
#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA

61
src/generic/colrdlgg.cpp
View File

@@ -162,6 +162,12 @@ bool wxGenericColourDialog::Create(wxWindow *parent, const wxColourData *data)
if (data)
m_colourData = *data;
#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
m_customColourBmp = NULL;
for ( unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++ )
m_customColoursBmp[i] = NULL;
#endif
InitializeColours();
CalculateMeasurements();
CreateWidgets();
@@ -225,6 +231,34 @@ void wxGenericColourDialog::OnCustomColourMouseClick(wxMouseEvent& event)
event.Skip();
}
void wxGenericColourDialog::CreateCustomBitmaps()
{
// Bitmap to preview selected colour (with alpha channel)
wxBitmap customColourBmp(m_singleCustomColourRect.GetSize(), 32);
customColourBmp.UseAlpha();
DoPreviewBitmap(customColourBmp, m_colourData.GetColour());
m_customColourBmp = new wxStaticBitmap(this, wxID_ANY, customColourBmp,
m_singleCustomColourRect.GetLeftTop(),
m_singleCustomColourRect.GetSize(),
wxBORDER_SUNKEN);
// 16 bitmaps to preview custom colours (with alpha channel)
for ( unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++ )
{
int x = ((i % 8) * (m_smallRectangleSize.x + m_gridSpacing)) + m_customColoursRect.x;
int y = ((i / 8) * (m_smallRectangleSize.y + m_gridSpacing)) + m_customColoursRect.y;
wxBitmap bmp(m_smallRectangleSize, 32);
bmp.UseAlpha();
DoPreviewBitmap(bmp, m_customColours[i]);
m_customColoursBmp[i] = new wxStaticBitmap(this, wxID_ANY, bmp,
wxPoint(x, y), m_smallRectangleSize);
m_customColoursBmp[i]->Bind(wxEVT_LEFT_DOWN,
&wxGenericColourDialog::OnCustomColourMouseClick, this);
}
}
#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
void wxGenericColourDialog::OnPaint(wxPaintEvent& WXUNUSED(event))
@@ -270,31 +304,8 @@ void wxGenericColourDialog::CreateWidgets()
wxBeginBusyCursor();
#if wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
// Bitmap to preview selected colour (with alpha channel)
wxBitmap customColourBmp(m_singleCustomColourRect.GetSize(), 32);
customColourBmp.UseAlpha();
DoPreviewBitmap(customColourBmp, m_colourData.GetColour());
m_customColourBmp = new wxStaticBitmap(this, wxID_ANY, customColourBmp,
m_singleCustomColourRect.GetLeftTop(),
m_singleCustomColourRect.GetSize(),
wxBORDER_SUNKEN);
// 16 bitmaps to preview custom colours (with alpha channel)
for (unsigned i = 0; i < WXSIZEOF(m_customColoursBmp); i++)
{
int x = ((i % 8)*(m_smallRectangleSize.x+m_gridSpacing)) + m_customColoursRect.x;
int y = ((i / 8)*(m_smallRectangleSize.y+m_gridSpacing)) + m_customColoursRect.y;
wxBitmap bmp(m_smallRectangleSize, 32);
bmp.UseAlpha();
DoPreviewBitmap(bmp, m_customColours[i]);
m_customColoursBmp[i] = new wxStaticBitmap(this, wxID_ANY, bmp,
wxPoint(x, y), m_smallRectangleSize);
m_customColoursBmp[i]->Bind(wxEVT_LEFT_DOWN,
&wxGenericColourDialog::OnCustomColourMouseClick, this);
}
#endif // wxCLRDLGG_USE_PREVIEW_WITH_ALPHA
CreateCustomBitmaps();
#endif
wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );