HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove management of color from etk to agg lib

Browse Source
This commit is contained in:
Edouard Dupin
2012-08-21 18:17:09 +02:00
parent 6f10243046
commit e27720372b
10 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Sources/appl/Colorize/Colorize.cpp
View File

@@ -35,8 +35,8 @@
Colorize::Colorize( etk::UString &newColorName)
{
m_colorFG = etk::color::black;
m_colorBG = etk::color::black;
m_colorFG = draw::color::black;
m_colorBG = draw::color::black;
italic = false;
bold = false;
@@ -50,8 +50,8 @@ Colorize::Colorize(void)
{
ColorName = "no_name";
m_colorFG = etk::color::black;
m_colorBG = etk::color::black;
m_colorFG = draw::color::black;
m_colorBG = draw::color::black;
italic = false;
bold = false;

8
Sources/appl/Colorize/Colorize.h
View File

@@ -40,8 +40,8 @@ class Colorize {
void SetFgColor(const char *myColor);
void SetBgColor(const char *myColor);
etk::Color & GetFG(void) { return m_colorFG; };
etk::Color & GetBG(void) { return m_colorBG; };
draw::Color & GetFG(void) { return m_colorFG; };
draw::Color & GetBG(void) { return m_colorBG; };
bool HaveBg(void);
@@ -54,8 +54,8 @@ class Colorize {
private:
etk::UString ColorName; //!< curent color Name
etk::Color m_colorFG;
etk::Color m_colorBG;
draw::Color m_colorFG;
draw::Color m_colorBG;
bool italic;
bool bold;

10
Sources/appl/Colorize/ColorizeManager.cpp
View File

@@ -61,7 +61,7 @@ class classColorManager: public ewol::EObject
void LoadFile(const char * xmlFilename);
Colorize * Get(const char *colorName);
Colorize * Get(etk::UString &colorName);
etk::Color& Get(basicColor_te myColor);
draw::Color& Get(basicColor_te myColor);
bool Exist(etk::UString &colorName);
bool Exist(const char *colorName);
void DisplayListOfColor(void);
@@ -70,7 +70,7 @@ class classColorManager: public ewol::EObject
etk::UString m_fileColor;
etk::Vector<Colorize*> listMyColor; //!< List of ALL Color
Colorize * errorColor;
etk::Color basicColors[COLOR_NUMBER_MAX];
draw::Color basicColors[COLOR_NUMBER_MAX];
};
@@ -316,7 +316,7 @@ Colorize *classColorManager::Get(etk::UString &colorName)
return Get(colorName.c_str());
}
etk::Color & classColorManager::Get(basicColor_te myColor)
draw::Color & classColorManager::Get(basicColor_te myColor)
{
if (myColor < COLOR_NUMBER_MAX) {
return basicColors[myColor];
@@ -417,9 +417,9 @@ Colorize* ColorizeManager::Get(etk::UString &colorName)
return localManager->Get(colorName);
}
etk::Color errorColor;
draw::Color errorColor;
etk::Color& ColorizeManager::Get(basicColor_te myColor)
draw::Color& ColorizeManager::Get(basicColor_te myColor)
{
if (NULL == localManager) {
return errorColor;

2
Sources/appl/Colorize/ColorizeManager.h
View File

@@ -57,7 +57,7 @@ namespace ColorizeManager
void LoadFile(const char * xmlFilename);
Colorize * Get(const char *colorName);
Colorize * Get(etk::UString &colorName);
etk::Color& Get(basicColor_te myColor);
draw::Color& Get(basicColor_te myColor);
bool Exist(etk::UString &colorName);
bool Exist(const char *colorName);
void DisplayListOfColor(void);