atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] Text compositing is now able to display background color

Browse Source
This commit is contained in:
Edouard DUPIN 2012-11-19 10:02:00 +01:00
parent cfa965269d
commit 3a41e938a6
3 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/etk vendored

@ -1 +1 @@
Subproject commit 1f9db2550cc2a08f9118ac1b2686f17ebd1e3a73 Subproject commit 668f19abbe82a4ccb078d64844e8974ac17ea87f

7
sources/ewol/compositing/Draw.cpp
View File

@ -465,12 +465,6 @@ void ewol::Drawing::Rectangle(etk::Vector3D<float> dest)
{ {
ResetCount(); ResetCount();
InternalSetColor(m_color); InternalSetColor(m_color);
/*
x += 3;
y += 3;
w -= 6;
h -= 6;
*/
/* Bitmap position /* Bitmap position
* xA xB * xA xB
* yC *------* * yC *------*
@ -482,7 +476,6 @@ void ewol::Drawing::Rectangle(etk::Vector3D<float> dest)
float dxB = dest.x; float dxB = dest.x;
float dyC = m_position.y; float dyC = m_position.y;
float dyD = dest.y; float dyD = dest.y;
if (true == m_clippingEnable) { if (true == m_clippingEnable) {
if (dxA < m_clippingPosStart.x) { if (dxA < m_clippingPosStart.x) {
dxA = m_clippingPosStart.x; dxA = m_clippingPosStart.x;

36
sources/ewol/compositing/Text.cpp
View File

@ -220,14 +220,14 @@ void ewol::Text::SetClipping(etk::Vector3D<float> pos, etk::Vector3D<float> posE
m_clippingPosStop.z = pos.z; m_clippingPosStop.z = pos.z;
} }
m_clippingEnable = true; m_clippingEnable = true;
m_vectorialDraw.SetClipping(m_clippingPosStart, m_clippingPosStop); //m_vectorialDraw.SetClipping(m_clippingPosStart, m_clippingPosStop);
} }
void ewol::Text::SetClippingMode(bool newMode) void ewol::Text::SetClippingMode(bool newMode)
{ {
m_clippingEnable = newMode; m_clippingEnable = newMode;
m_vectorialDraw.SetClippingMode(m_clippingEnable); //m_vectorialDraw.SetClippingMode(m_clippingEnable);
} }
@ -320,10 +320,14 @@ void ewol::Text::Print(const etk::UString& text, const etk::Vector<TextDecoratio
SetFontMode(decoration[iii].m_mode); SetFontMode(decoration[iii].m_mode);
} }
if (m_colorBg.a != 0) { if (m_colorBg.a != 0) {
m_vectorialDraw.SetPos(m_position); etk::Vector3D<float> pos = m_position;
m_vectorialDraw.RectangleWidth(etk::Vector3D<float>(15,15,0) ); m_vectorialDraw.SetPos(pos);
Print(text[iii]);
float fontHeigh = m_font->GetHeight(m_mode);
m_vectorialDraw.RectangleWidth(etk::Vector3D<float>(m_position.x-pos.x,fontHeigh,0.0f) );
} else {
Print(text[iii]);
} }
Print(text[iii]);
} }
} else { } else {
float basicSpaceWidth = CalculateSize(' ').x; float basicSpaceWidth = CalculateSize(' ').x;
@ -361,18 +365,30 @@ void ewol::Text::Print(const etk::UString& text, const etk::Vector<TextDecoratio
} }
// display all the elements // display all the elements
for(int32_t iii=currentId; iii<stop && iii<text.Size(); iii++) { for(int32_t iii=currentId; iii<stop && iii<text.Size(); iii++) {
float fontHeigh = m_font->GetHeight(m_mode);
// Get specific decoration if provided
if (iii<decoration.Size()) {
SetColor(decoration[iii].m_colorFg);
SetColorBG(decoration[iii].m_colorBg);
SetFontMode(decoration[iii].m_mode);
}
// special for the justify mode
if (text[iii] == (uniChar_t)' ') { if (text[iii] == (uniChar_t)' ') {
m_vectorialDraw.SetPos(m_position);
// Must generate a dynamic space : // Must generate a dynamic space :
SetPos(etk::Vector3D<float>(m_position.x + interpolation, SetPos(etk::Vector3D<float>(m_position.x + interpolation,
m_position.y, m_position.y,
m_position.z) ); m_position.z) );
m_vectorialDraw.RectangleWidth(etk::Vector3D<float>(interpolation,fontHeigh,0.0f) );
} else { } else {
if (iii<decoration.Size()) { if (m_colorBg.a != 0) {
SetColor(decoration[iii].m_colorFg); etk::Vector3D<float> pos = m_position;
SetColorBG(decoration[iii].m_colorBg); m_vectorialDraw.SetPos(pos);
SetFontMode(decoration[iii].m_mode); Print(text[iii]);
m_vectorialDraw.RectangleWidth(etk::Vector3D<float>(m_position.x-pos.x,fontHeigh,0.0f) );
} else {
Print(text[iii]);
} }
Print(text[iii]);
} }
} }
if (currentId == stop) { if (currentId == stop) {