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

[DEBUG] correction of the shaper internal draw

Browse Source
This commit is contained in:
Edouard DUPIN 2014-03-25 19:45:42 +01:00
parent e47d5a8f07
commit 6be6a33789
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sources/ewol/compositing/Shaper.cpp
View File

@ -431,11 +431,13 @@ const float modeDisplay[][8] = {
void ewol::compositing::Shaper::setShape(const vec2& _origin, const vec2& _size, const vec2& _insidePos, const vec2& _insideSize) { void ewol::compositing::Shaper::setShape(const vec2& _origin, const vec2& _size, const vec2& _insidePos, const vec2& _insideSize) {
ewol::Padding borderTmp = getBorder(); ewol::Padding borderTmp = getBorder();
ewol::Padding paddingIn = getPaddingIn(); ewol::Padding paddingIn = getPaddingIn();
//ewol::Padding paddingOut = getPaddingOut(); ewol::Padding paddingOut = getPaddingOut();
ewol::Padding padding = paddingIn + borderTmp + paddingOut;
ewol::Padding enveloppe(_origin.x(), ewol::Padding enveloppe(_origin.x(),
_origin.y() + _size.y(), _origin.y() + _size.y(),
_origin.x() + _size.x(), _origin.x() + _size.x(),
_origin.y()); _origin.y());
#if 0
ewol::Padding inside(_insidePos.x(), ewol::Padding inside(_insidePos.x(),
_insidePos.y() + _insideSize.y(), _insidePos.y() + _insideSize.y(),
_insidePos.x() + _insideSize.x(), _insidePos.x() + _insideSize.x(),
@ -448,6 +450,21 @@ void ewol::compositing::Shaper::setShape(const vec2& _origin, const vec2& _size,
insideBorder.yTop() + borderTmp.yTop(), insideBorder.yTop() + borderTmp.yTop(),
insideBorder.xRight() + borderTmp.xRight(), insideBorder.xRight() + borderTmp.xRight(),
insideBorder.yButtom() - borderTmp.yButtom()); insideBorder.yButtom() - borderTmp.yButtom());
#else
ewol::Padding border(_insidePos.x() - padding.xLeft() + paddingOut.xLeft(),
_insidePos.y() + _insideSize.y() + padding.yTop() - paddingOut.yTop(),
_insidePos.x() + _insideSize.x() + padding.xRight() - paddingOut.xRight(),
_insidePos.y() - padding.yButtom() + paddingOut.yButtom());
ewol::Padding insideBorder(border.xLeft() + borderTmp.xLeft(),
border.yTop() - borderTmp.yTop(),
border.xRight() - borderTmp.xRight(),
border.yButtom() + borderTmp.yButtom());
ewol::Padding inside(insideBorder.xLeft() + etk_max(0.0f, paddingIn.xLeft()),
insideBorder.yTop() - etk_max(0.0f, paddingIn.yTop()),
insideBorder.xRight() - etk_max(0.0f, paddingIn.xRight()),
insideBorder.yButtom() + etk_max(0.0f, paddingIn.yButtom()));
#endif
/* /*
EWOL_ERROR(" enveloppe = " << enveloppe); EWOL_ERROR(" enveloppe = " << enveloppe);
EWOL_ERROR(" border = " << border); EWOL_ERROR(" border = " << border);