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

Rework the button system to work with the fill system in X and Y

Browse Source
This commit is contained in:
Edouard Dupin 2011-12-21 18:04:07 +01:00
parent 7150727dd5
commit 2e50ce7690
1 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Sources/libewol/ewol/widget/Button.cpp
View File

@ -75,8 +75,8 @@ bool ewol::Button::CalculateMinSize(void)
int32_t fontId = GetDefaultFontId(); int32_t fontId = GetDefaultFontId();
int32_t minWidth = ewol::GetWidth(fontId, m_label.c_str()); int32_t minWidth = ewol::GetWidth(fontId, m_label.c_str());
int32_t minHeight = ewol::GetHeight(fontId); int32_t minHeight = ewol::GetHeight(fontId);
m_minSize.x = 10+minWidth; m_minSize.x = 16+minWidth;
m_minSize.y = 10+minHeight; m_minSize.y = 16+minHeight;
return true; return true;
} }
@ -101,74 +101,59 @@ void ewol::Button::OnRegenerateDisplay(void)
{ {
// clean the object list ... // clean the object list ...
ClearOObjectList(); ClearOObjectList();
/*
// TODO later : Add this in the basic element of the widget ...
int32_t borderSize = 2; int32_t borderSize = 2;
int32_t paddingSize = 3; int32_t paddingSize = 3;
int32_t tmpSizeX = 0;
int32_t tmpSizeY = 0; int32_t tmpSizeX = m_minSize.x;
int32_t tmpOriginX = 0; int32_t tmpSizeY = m_minSize.y;
int32_t tmpOriginX = 0; int32_t tmpOriginX = (m_size.x - tmpSizeX) / 2;
int32_t tmpOriginY = (m_size.y - tmpSizeY) / 2;
// no change for the text orogin :
int32_t tmpTextOriginX = (m_size.x - tmpSizeX) / 2 + borderSize + 2*paddingSize;
int32_t tmpTextOriginY = (m_size.y - tmpSizeY) / 2 + borderSize + 2*paddingSize;
if (true==m_userFillX) { if (true==m_userFillX) {
tmpSizeX = m_size.x;
tmpOriginX = 0;
} }
if (true==m_userFillY) { if (true==m_userFillY) {
tmpSizeY = m_size.y;
tmpOriginY = 0;
} }
*/ tmpOriginX += paddingSize;
/* tmpOriginY += paddingSize;
ewol::OObject2DColored * tmpOObjects = new ewol::OObject2DColored; tmpSizeX -= 2*paddingSize;
tmpOObjects->SetColor(0.0, 0.0, 0.0, 1.0); tmpSizeY -= 2*paddingSize;
tmpOObjects->Rectangle( 2, 2, m_size.x-4, m_size.y-4);
tmpOObjects->SetColor(1.0, 1.0, 1.0, 1.0);
tmpOObjects->Rectangle( 3, 3, m_size.x-6, m_size.y-6);
AddOObject(tmpOObjects, "BouttonDecoration");
*/
#if 1
int32_t borderWidth = 2;
ewol::OObject2DText * tmpText = new ewol::OObject2DText("", -1, m_textColorFg); ewol::OObject2DText * tmpText = new ewol::OObject2DText("", -1, m_textColorFg);
int32_t fontId = GetDefaultFontId(); int32_t fontId = GetDefaultFontId();
int32_t fontHeight = ewol::GetHeight(fontId); int32_t fontHeight = ewol::GetHeight(fontId);
int32_t fontWidth = ewol::GetWidth(fontId, m_label.c_str()); int32_t fontWidth = ewol::GetWidth(fontId, m_label.c_str());
int32_t posy = (m_size.y - fontHeight - 6)/2 + 3; tmpText->Text(tmpTextOriginX, tmpTextOriginY, m_label.c_str());
int32_t posx = (m_size.x - fontWidth - 6)/2 + 3;
tmpText->Text(posx+2, posy, m_label.c_str());
ewol::OObject2DColored * tmpOObjects = new ewol::OObject2DColored; ewol::OObject2DColored * tmpOObjects = new ewol::OObject2DColored;
int32_t radius = fontHeight / 2;
tmpOObjects->SetColor(m_textColorBg); tmpOObjects->SetColor(m_textColorBg);
tmpOObjects->Rectangle( ((m_size.x-fontWidth-10)/2)+radius, posy, fontWidth-radius, radius*2); tmpOObjects->Rectangle( tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY);
tmpOObjects->SetColor(m_textColorFg); tmpOObjects->SetColor(m_textColorFg);
//EWOL_DEBUG("m_textColorFg=(" << m_textColorFg.red << " " << m_textColorFg.green << " " << m_textColorFg.blue << " " << m_textColorFg.alpha << ")" ); tmpOObjects->RectangleBorder( tmpOriginX, tmpOriginY, tmpSizeX, tmpSizeY, borderSize);
tmpOObjects->Line( ((m_size.x-fontWidth-10)/2)+radius, posy, ((m_size.x-fontWidth-10)/2)+fontWidth, posy, borderWidth);
tmpOObjects->Line( ((m_size.x-fontWidth-10)/2)+radius, posy+fontHeight, ((m_size.x-fontWidth-10)/2)+fontWidth, posy+fontHeight, borderWidth);
posy += fontHeight/2;
tmpOObjects->SetColor(m_textColorBg);
tmpOObjects->DiscPart(((m_size.x-fontWidth-10)/2)+radius, posy, radius, 180, 360);
tmpOObjects->SetColor(m_textColorFg);
tmpOObjects->CirclePart(((m_size.x-fontWidth-10)/2)+radius, posy, radius, borderWidth, 180, 360);
tmpOObjects->SetColor(m_textColorBg);
tmpOObjects->DiscPart(((m_size.x-fontWidth-10)/2)+fontWidth, posy, radius, 0, 180);
tmpOObjects->SetColor(m_textColorFg);
tmpOObjects->CirclePart(((m_size.x-fontWidth-10)/2)+fontWidth, posy, radius, borderWidth, 0, 180);
AddOObject(tmpOObjects, "BouttonDecoration"); AddOObject(tmpOObjects, "BouttonDecoration");
AddOObject(tmpText, "BouttonText"); AddOObject(tmpText, "BouttonText");
// Regenerate the event Area: // Regenerate the event Area:
EventAreaRemoveAll(); EventAreaRemoveAll();
coord origin; coord origin;
coord size; coord size;
origin.x = 3.0; origin.x = tmpOriginX;
origin.y = 3.0; origin.y = tmpOriginY;
size.x = m_size.x-6; size.x = tmpSizeX;
size.y = m_size.y-6; size.y = tmpSizeY;
AddEventArea(origin, size, FLAG_EVENT_INPUT_1 | FLAG_EVENT_INPUT_CLICKED_ALL, ewolEventButtonPressed); AddEventArea(origin, size, FLAG_EVENT_INPUT_1 | FLAG_EVENT_INPUT_CLICKED_ALL, ewolEventButtonPressed);
AddEventArea(origin, size, FLAG_EVENT_INPUT_ENTER, ewolEventButtonEnter); AddEventArea(origin, size, FLAG_EVENT_INPUT_ENTER, ewolEventButtonEnter);
AddEventArea(origin, size, FLAG_EVENT_INPUT_LEAVE, ewolEventButtonLeave); AddEventArea(origin, size, FLAG_EVENT_INPUT_LEAVE, ewolEventButtonLeave);
#endif
} }
/* /*