gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Open

Browse Source 
Fix Drawing artifact with round check buttons in menu under Cairo (#792)
This commit is contained in:
ManoloFLTK 2023-10-16 12:47:06 +02:00
parent 52f5653545
commit da5331b592
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fl_gtk.cxx
View File

@ -174,9 +174,12 @@ static void draw(int which, int x,int y,int w,int h, int inset)
void (*f)(int,int,int,int,double,double);
f = (which==FILL) ? fl_pie : fl_arc_i;
if (which >= CLOSED) {
f(x+w-d, y, d, d, w<=h ? 0 : -90, w<=h ? 180 : 90);
f(x, y+h-d, d, d, w<=h ? 180 : 90, w<=h ? 360 : 270);
} else if (which == UPPER_LEFT) {
if (w == h) f(x, y, d, d, 0, 360);
else {
f(x+w-d, y, d, d, w<=h ? 0 : -90, w<=h ? 180 : 90);
f(x, y+h-d, d, d, w<=h ? 180 : 90, w<=h ? 360 : 270);
}
} else if (which == UPPER_LEFT) {
f(x+w-d, y, d, d, 45, w<=h ? 180 : 90);
f(x, y+h-d, d, d, w<=h ? 180 : 90, 225);
} else { // LOWER_RIGHT
@ -232,9 +235,7 @@ static void gtk_round_up_box(int x, int y, int w, int h, Fl_Color c) {
static void gtk_round_down_box(int x, int y, int w, int h, Fl_Color c) {
gtk_color(c);
fl_antialias(0); // fix for issue #792
draw(FILL, x, y, w, h, 2);
fl_antialias(1); // fix for issue #792
gtk_color(fl_color_average(FL_WHITE, c, 0.1f));
draw(LOWER_RIGHT, x+1, y, w-2, h, 2);

6
src/fl_oxy.cxx
View File

@ -216,14 +216,12 @@ static void _oxy_rounded_box_(int x, int y, int w, int h, Fl_Color bg) {
fl_rectf(x + h / 2, y, w - h, h); // rectangle between left and right half-circle
fl_pie(x + w - h, y, h, h, 0.0, 90.0); // top-left quarter of circle
fl_pie(x + w - h, y, h, h, 270.0, 360.0); // bottom-left quarter of circle
} else if (w == h) {
fl_pie(x, y, w, w, 0.0, 360.0);
} else {
fl_antialias(0); // fix for issue #792
fl_pie(x, y, w, w, 0.0, 180.0); // top half of circle
fl_antialias(1); // fix for issue #792
fl_rectf(x, y + w / 2, w, h - w); // rectangle between top and bottom half-circle
fl_antialias(0); // fix for issue #792
fl_pie(x, y + h - w, w, w, 180.0, 360.0); // bottom half of circle
fl_antialias(1); // fix for issue #792
}
}

9
src/fl_round_box.cxx
View File

@ -44,8 +44,11 @@ static void draw(int which, int x,int y,int w,int h, int inset, Fl_Color color)
void (*f)(int,int,int,int,double,double);
f = (which==FILL) ? fl_pie : fl_arc_i;
if (which >= CLOSED) {
f(x+w-d, y, d, d, w<=h ? 0 : -90, w<=h ? 180 : 90);
f(x, y+h-d, d, d, w<=h ? 180 : 90, w<=h ? 360 : 270);
if (w == h) f(x, y, d, d, 0, 360);
else {
f(x+w-d, y, d, d, w<=h ? 0 : -90, w<=h ? 180 : 90);
f(x, y+h-d, d, d, w<=h ? 180 : 90, w<=h ? 360 : 270);
}
} else if (which == UPPER_LEFT) {
f(x+w-d, y, d, d, 45, w<=h ? 180 : 90);
f(x, y+h-d, d, d, w<=h ? 180 : 90, 225);
@ -73,9 +76,7 @@ extern const uchar* fl_gray_ramp();
void fl_round_down_box(int x, int y, int w, int h, Fl_Color bgcolor) {
const uchar *g = fl_gray_ramp();
fl_antialias(0); // fix for issue #792
draw(FILL, x, y, w, h, 2, Fl::box_color(bgcolor));
fl_antialias(1); // fix for issue #792
draw(UPPER_LEFT, x+1, y, w-2, h, 0, (Fl_Color)g[(int)'N']);
draw(UPPER_LEFT, x+1, y, w-2, h, 1, (Fl_Color)g[(int)'H']);
draw(UPPER_LEFT, x, y, w, h, 0, (Fl_Color)g[(int)'N']);