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

Add support for alpha channel in wxColourPicker (wxGTK).

Browse Source 
Showing opacity slider is controlled by new flag wxCLRP_SHOW_ALPHA.
This commit is contained in:
Artur Wieczorekl 2015-11-11 17:32:21 +01:00 committed by Artur Wieczorek
parent 63d6db3131
commit 59f5fe993b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/clrpicker.h
View File

@ -68,6 +68,7 @@ protected:
// NOTE: this style is supported just by wxColourButtonGeneric and
// thus is not exposed in wxColourPickerCtrl
#define wxCLRP_SHOW_LABEL 0x0008
#define wxCLRP_SHOW_ALPHA 0x0010
// map platform-dependent controls which implement the wxColourPickerWidgetBase
// under the name "wxColourPickerWidget".
@ -146,7 +147,7 @@ public: // internal functions
protected:
virtual long GetPickerStyle(long style) const wxOVERRIDE
{ return (style & wxCLRP_SHOW_LABEL); }
{ return (style & (wxCLRP_SHOW_LABEL | wxCLRP_SHOW_ALPHA)); }
private:
wxDECLARE_DYNAMIC_CLASS(wxColourPickerCtrl);

3
src/gtk/clrpicker.cpp
View File

@ -78,6 +78,9 @@ bool wxColourButton::Create( wxWindow *parent, wxWindowID id,
#endif
g_object_ref(m_widget);
// Display opacity slider
g_object_set(G_OBJECT(m_widget), "use-alpha",
static_cast<bool>(style & wxCLRP_SHOW_ALPHA), NULL);
// GtkColourButton signals
g_signal_connect(m_widget, "color-set",
G_CALLBACK(gtk_clrbutton_setcolor_callback), this);