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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sources/appl/Buffer/BufferEmpty.cpp
View File

@ -94,7 +94,7 @@ int32_t BufferEmpty::Display(ewol::OObject2DTextColored& OOTextNormal,
tmpDisplay = "No Buffer Availlable to display"; tmpDisplay = "No Buffer Availlable to display";
OOTextNormal.Text(textPos, tmpDisplay); OOTextNormal.Text(textPos, tmpDisplay);
OOColored.SetColor(etk::color::white); OOColored.SetColor(draw::color::white);
OOColored.Rectangle( 0, 0, sizeX, sizeY); OOColored.Rectangle( 0, 0, sizeX, sizeY);
return ERR_NONE; return ERR_NONE;

6
Sources/appl/Buffer/BufferText.cpp
View File

@ -225,7 +225,7 @@ void BufferText::DrawLineNumber(ewol::OObject2DTextColored* OOText, ewol::OObjec
#define CURSOR_THICKNESS (1.2) #define CURSOR_THICKNESS (1.2)
void BufferText::DrawCursor(ewol::OObject2DColored* OOColored, int32_t x, int32_t y, int32_t letterHeight, int32_t letterWidth, clipping_ts &clip) void BufferText::DrawCursor(ewol::OObject2DColored* OOColored, int32_t x, int32_t y, int32_t letterHeight, int32_t letterWidth, clipping_ts &clip)
{ {
etk::Color & tmpppppp = ColorizeManager::Get(COLOR_CODE_CURSOR); draw::Color & tmpppppp = ColorizeManager::Get(COLOR_CODE_CURSOR);
OOColored->SetColor(tmpppppp); OOColored->SetColor(tmpppppp);
if (true == ewol::IsSetInsert()) { if (true == ewol::IsSetInsert()) {
OOColored->Rectangle( x, y, letterWidth, letterHeight); OOColored->Rectangle( x, y, letterWidth, letterHeight);
@ -317,8 +317,8 @@ int32_t BufferText::Display(ewol::OObject2DTextColored& OOTextNormal,
// Get color : // Get color :
Colorize * myColor = ColorizeManager::Get("normal"); Colorize * myColor = ColorizeManager::Get("normal");
Colorize * myColorSel = ColorizeManager::Get("SelectedText"); Colorize * myColorSel = ColorizeManager::Get("SelectedText");
etk::Color & myColorSpace = ColorizeManager::Get(COLOR_CODE_SPACE); draw::Color & myColorSpace = ColorizeManager::Get(COLOR_CODE_SPACE);
etk::Color & myColorTab = ColorizeManager::Get(COLOR_CODE_TAB); draw::Color & myColorTab = ColorizeManager::Get(COLOR_CODE_TAB);
Colorize * selectColor = NULL; Colorize * selectColor = NULL;
ewol::OObject2DTextColored* OOTextSelected = NULL; ewol::OObject2DTextColored* OOTextSelected = NULL;

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

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

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

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

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

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

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

@ -57,7 +57,7 @@ namespace ColorizeManager
void LoadFile(const char * xmlFilename); void LoadFile(const char * xmlFilename);
Colorize * Get(const char *colorName); Colorize * Get(const char *colorName);
Colorize * Get(etk::UString &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(etk::UString &colorName);
bool Exist(const char *colorName); bool Exist(const char *colorName);
void DisplayListOfColor(void); void DisplayListOfColor(void);

6
Sources/appl/Gui/BufferView.cpp
View File

@ -72,7 +72,7 @@ void BufferView::OnReceiveMessage(ewol::EObject * CallerObject, const char * eve
} }
etk::Color BufferView::GetBasicBG(void) draw::Color BufferView::GetBasicBG(void)
{ {
return ColorizeManager::Get(COLOR_LIST_BG_1); return ColorizeManager::Get(COLOR_LIST_BG_1);
} }
@ -82,7 +82,7 @@ uint32_t BufferView::GetNuberOfColomn(void)
return 1; return 1;
} }
bool BufferView::GetTitle(int32_t colomn, etk::UString &myTitle, etk::Color &fg, etk::Color &bg) bool BufferView::GetTitle(int32_t colomn, etk::UString &myTitle, draw::Color &fg, draw::Color &bg)
{ {
myTitle = "Buffers : "; myTitle = "Buffers : ";
return true; return true;
@ -93,7 +93,7 @@ uint32_t BufferView::GetNuberOfRaw(void)
return BufferManager::SizeOpen(); return BufferManager::SizeOpen();
} }
bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, etk::Color &fg, etk::Color &bg) bool BufferView::GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, draw::Color &fg, draw::Color &bg)
{ {
etk::File name; etk::File name;
bool isModify; bool isModify;

6
Sources/appl/Gui/BufferView.h
View File

@ -54,11 +54,11 @@ class BufferView : public ewol::List
virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data); virtual void OnReceiveMessage(ewol::EObject * CallerObject, const char * eventId, etk::UString data);
protected: protected:
// function call to display the list : // function call to display the list :
virtual etk::Color GetBasicBG(void); virtual draw::Color GetBasicBG(void);
virtual uint32_t GetNuberOfColomn(void); virtual uint32_t GetNuberOfColomn(void);
virtual bool GetTitle(int32_t colomn, etk::UString &myTitle, etk::Color &fg, etk::Color &bg); virtual bool GetTitle(int32_t colomn, etk::UString &myTitle, draw::Color &fg, draw::Color &bg);
virtual uint32_t GetNuberOfRaw(void); virtual uint32_t GetNuberOfRaw(void);
virtual bool GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, etk::Color &fg, etk::Color &bg); virtual bool GetElement(int32_t colomn, int32_t raw, etk::UString &myTextToWrite, draw::Color &fg, draw::Color &bg);
virtual bool OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent, int32_t colomn, int32_t raw, float x, float y); virtual bool OnItemEvent(int32_t IdInput, ewol::eventInputType_te typeEvent, int32_t colomn, int32_t raw, float x, float y);
private: private:
int32_t m_selectedIdRequested; int32_t m_selectedIdRequested;

6
Sources/appl/Gui/CodeView.cpp
View File

@ -56,10 +56,10 @@ CodeView::CodeView(void)
m_lineNumberList.Clear(); m_lineNumberList.Clear();
m_textColorFg = etk::color::black; m_textColorFg = draw::color::black;
m_textColorBg = etk::color::black; m_textColorBg = draw::color::black;
m_textColorBg.alpha = 0x40; m_textColorBg.a = 0x40;
SetCanHaveFocus(true); SetCanHaveFocus(true);
RegisterMultiCast(ednMsgBufferId); RegisterMultiCast(ednMsgBufferId);
RegisterMultiCast(ednMsgGuiCopy); RegisterMultiCast(ednMsgGuiCopy);

4
Sources/appl/Gui/CodeView.h
View File

@ -49,8 +49,8 @@ class CodeView :public ewol::WidgetScrooled
virtual bool CalculateMinSize(void); virtual bool CalculateMinSize(void);
private: private:
etk::UString m_label; etk::UString m_label;
etk::Color m_textColorFg; //!< Text color draw::Color m_textColorFg; //!< Text color
etk::Color m_textColorBg; //!< Background color draw::Color m_textColorBg; //!< Background color
int32_t m_bufferID; int32_t m_bufferID;
bool m_buttunOneSelected; bool m_buttunOneSelected;
etk::Vector<Vector2D<float> > m_lineNumberList; etk::Vector<Vector2D<float> > m_lineNumberList;