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

Add opacity control feature to wxColourData.

Browse Source 
Added internal flag (with corresponding accessors) which purpose is to enable/disable modifying the opacity of the colours in colour dialogs.
This commit is contained in:
Artur Wieczorek
2015-10-27 10:02:51 +01:00
parent 3dc013920b
commit 809a07a65d
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/wx/colourdata.h
View File

@@ -26,6 +26,8 @@ public:
void SetChooseFull(bool flag) { m_chooseFull = flag; } void SetChooseFull(bool flag) { m_chooseFull = flag; }
bool GetChooseFull() const { return m_chooseFull; } bool GetChooseFull() const { return m_chooseFull; }
void SetChooseAlpha(bool flag) { m_chooseAlpha = flag; }
bool GetChooseAlpha() const { return m_chooseAlpha; }
void SetColour(const wxColour& colour) { m_dataColour = colour; } void SetColour(const wxColour& colour) { m_dataColour = colour; }
const wxColour& GetColour() const { return m_dataColour; } const wxColour& GetColour() const { return m_dataColour; }
wxColour& GetColour() { return m_dataColour; } wxColour& GetColour() { return m_dataColour; }
@@ -45,6 +47,9 @@ public:
wxColour m_custColours[NUM_CUSTOM]; wxColour m_custColours[NUM_CUSTOM];
bool m_chooseFull; bool m_chooseFull;
protected:
bool m_chooseAlpha;
wxDECLARE_DYNAMIC_CLASS(wxColourData); wxDECLARE_DYNAMIC_CLASS(wxColourData);
}; };

13
src/common/colourdata.cpp
View File

@@ -25,6 +25,7 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject);
wxColourData::wxColourData() wxColourData::wxColourData()
{ {
m_chooseFull = false; m_chooseFull = false;
m_chooseAlpha = false;
m_dataColour.Set(0,0,0); m_dataColour.Set(0,0,0);
// m_custColours are wxNullColours initially // m_custColours are wxNullColours initially
} }
@@ -61,6 +62,7 @@ wxColourData& wxColourData::operator=(const wxColourData& data)
m_dataColour = data.m_dataColour; m_dataColour = data.m_dataColour;
m_chooseFull = data.m_chooseFull; m_chooseFull = data.m_chooseFull;
m_chooseAlpha = data.m_chooseAlpha;
return *this; return *this;
} }
@@ -85,6 +87,9 @@ wxString wxColourData::ToString() const
str += clr.GetAsString(wxC2S_HTML_SYNTAX); str += clr.GetAsString(wxC2S_HTML_SYNTAX);
} }
str.Append(wxCOL_DATA_SEP);
str.Append(m_chooseAlpha ? '1' : '0');
return str; return str;
} }
@@ -102,6 +107,14 @@ bool wxColourData::FromString(const wxString& str)
else else
success = m_custColours[i].Set(token); success = m_custColours[i].Set(token);
} }
if ( success )
{
token = tokenizer.GetNextToken();
m_chooseAlpha = token == wxS("1");
success = m_chooseAlpha || token == wxS("0");
}
return success; return success;
} }