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

display the rectangle with clipping error corrected

Browse Source
This commit is contained in:
Edouard Dupin 2012-02-17 23:43:01 +01:00
parent 74a1a39d8c
commit 645c3b6855
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Sources/libewol/ewol/OObject/2DColored.cpp
View File

@ -441,6 +441,11 @@ void ewol::OObject2DColored::Rectangle(etkFloat_t x, etkFloat_t y, etkFloat_t w,
{ {
ResetCount(); ResetCount();
if( 0 >= h
|| 0 >= w) {
return;
}
SetPoint(x , y + h); SetPoint(x , y + h);
SetPoint(x , y); SetPoint(x , y);
SetPoint(x + w, y); SetPoint(x + w, y);
@ -463,8 +468,8 @@ void ewol::OObject2DColored::Rectangle(etkFloat_t x, etkFloat_t y, etkFloat_t w,
* yD *------* * yD *------*
*/ */
etkFloat_t dxA = x; etkFloat_t dxA = x;
etkFloat_t dxB = y; etkFloat_t dxB = x + w;
etkFloat_t dyC = x + w; etkFloat_t dyC = y;
etkFloat_t dyD = y + h; etkFloat_t dyD = y + h;
//EWOL_INFO("Rectangle size : (" << x << "," << y << ") in clipping (" << drawClipping.x << "," << drawClipping.y << ") ==> (" << drawClipping.w << "," << drawClipping.h << ")"); //EWOL_INFO("Rectangle size : (" << x << "," << y << ") in clipping (" << drawClipping.x << "," << drawClipping.y << ") ==> (" << drawClipping.w << "," << drawClipping.h << ")");
@ -480,13 +485,17 @@ void ewol::OObject2DColored::Rectangle(etkFloat_t x, etkFloat_t y, etkFloat_t w,
if (dyD > drawClipping.y + drawClipping.h) { if (dyD > drawClipping.y + drawClipping.h) {
dyD = drawClipping.y + drawClipping.h; dyD = drawClipping.y + drawClipping.h;
} }
if( dyC >= dyD
|| dxA >= dxB) {
return;
}
SetPoint(dxA, dyD); SetPoint(dxA, dyD);
SetPoint(dxA, dxB); SetPoint(dxA, dyC);
SetPoint(dyC, dxB); SetPoint(dxB, dyC);
SetPoint(dyC, dxB); SetPoint(dxB, dyC);
SetPoint(dyC, dyD); SetPoint(dxB, dyD);
SetPoint(dxA, dyD); SetPoint(dxA, dyD);
} }