dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Efl.Gfx.Path: Change draw of a rounded rect from arc to quadratic" 

Summary:
This reverts commit 4f15bde706.
It is the correct way to draw with arc_to.
And breaking compatibility for current_get.

Test Plan: N/A

Reviewers: Hermet, kimcinoo, herb

Reviewed By: Hermet

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D12030
This commit is contained in:
junsu choi 2020-06-25 13:13:31 +09:00 committed by Hermet Park
parent 3cf052af33
commit fd4f4c4364
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/efl/interfaces/efl_gfx_path.c
View File

@ -1108,18 +1108,16 @@ _efl_gfx_path_append_rect(Eo *obj, Efl_Gfx_Path_Data *pd,
}
// clamp the rx and ry radius value.
rx = 2*rx;
ry = 2*ry;
if (rx > w) rx = w;
if (ry > h) ry = h;
_efl_gfx_path_append_move_to(obj, pd, x + rx, y);
_efl_gfx_path_append_line_to(obj, pd, x + (w - rx), y);
_efl_gfx_path_append_quadratic_to(obj, pd, x + w, y + ry, x + w, y);
_efl_gfx_path_append_line_to(obj, pd, x + w, y + (h - ry));
_efl_gfx_path_append_quadratic_to(obj, pd, x + (w - rx), y + h, x + w, y + h);
_efl_gfx_path_append_line_to(obj, pd, x + rx, y + h);
_efl_gfx_path_append_quadratic_to(obj, pd, x , y + (h - ry), x, y + h);
_efl_gfx_path_append_line_to(obj, pd, x, y + ry);
_efl_gfx_path_append_quadratic_to(obj, pd, x + rx, y, x, y);
_efl_gfx_path_append_move_to(obj, pd, x, y + h/2);
_efl_gfx_path_append_arc(obj, pd, x, y + h - ry, rx, ry, 180, 90);
_efl_gfx_path_append_arc(obj, pd, x + w - rx, y + h - ry, rx, ry, 270, 90);
_efl_gfx_path_append_arc(obj, pd, x + w - rx, y, rx, ry, 0, 90);
_efl_gfx_path_append_arc(obj, pd, x, y, rx, ry, 90, 90);
_efl_gfx_path_append_close(obj, pd);
//update convex flag