AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 14:31:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dotted-lines3' into 'master'

Browse Source 
Modernize error underlines

See merge request GNOME/gtk!3398
This commit is contained in:
Matthias Clasen 2021-04-03 20:14:13 +00:00
commit fcaadf6724
1 changed files with 17 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gtk/gskpango.c
View File

@ -119,6 +119,7 @@ gsk_pango_renderer_draw_rectangle (PangoRenderer *renderer,
GdkRGBA rgba; GdkRGBA rgba;
get_color (crenderer, part, &rgba); get_color (crenderer, part, &rgba);
gtk_snapshot_append_color (crenderer->snapshot, gtk_snapshot_append_color (crenderer->snapshot,
&rgba, &rgba,
&GRAPHENE_RECT_INIT ((double)x / PANGO_SCALE, &GRAPHENE_RECT_INIT ((double)x / PANGO_SCALE,
@ -169,8 +170,6 @@ gsk_pango_renderer_draw_trapezoid (PangoRenderer *renderer,
cairo_destroy (cr); cairo_destroy (cr);
} }
#define HEIGHT_RATIO (M_SQRT2/5.0)
static void static void
gsk_pango_renderer_draw_error_underline (PangoRenderer *renderer, gsk_pango_renderer_draw_error_underline (PangoRenderer *renderer,
int x, int x,
@ -178,61 +177,34 @@ gsk_pango_renderer_draw_error_underline (PangoRenderer *renderer,
int width, int width,
int height) int height)
{ {
GdkRGBA rgba;
double xx, yy, ww, hh;
double hs;
double e, o;
GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer); GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer);
double xx, yy, ww, hh;
GdkRGBA rgba;
GskRoundedRect dot;
xx = (double)x / PANGO_SCALE; xx = (double)x / PANGO_SCALE;
yy = (double)y / PANGO_SCALE; yy = (double)y / PANGO_SCALE;
ww = (double)width / PANGO_SCALE; ww = (double)width / PANGO_SCALE;
hh = (double)height / PANGO_SCALE; hh = (double)height / PANGO_SCALE;
hs = hh / M_SQRT2;
e = fmod (ww - 2 * hs * HEIGHT_RATIO, hs * (1 - HEIGHT_RATIO));
#if 0
gdk_rgba_parse (&rgba, "yellow");
gtk_snapshot_append_color (crenderer->snapshot, &rgba,
&GRAPHENE_RECT_INIT (xx, yy, ww, hh));
#endif
get_color (crenderer, PANGO_RENDER_PART_UNDERLINE, &rgba); get_color (crenderer, PANGO_RENDER_PART_UNDERLINE, &rgba);
gtk_snapshot_save (crenderer->snapshot);
gtk_snapshot_translate (crenderer->snapshot,
&GRAPHENE_POINT_INIT (xx, yy));
gtk_snapshot_rotate (crenderer->snapshot, 45); gtk_snapshot_push_repeat (crenderer->snapshot,
gtk_snapshot_translate (crenderer->snapshot, &GRAPHENE_RECT_INIT (xx, yy, ww, hh),
&GRAPHENE_POINT_INIT (e / 2 + hs * HEIGHT_RATIO, NULL);
- hs * HEIGHT_RATIO));
xx = yy = o = 0; gsk_rounded_rect_init_from_rect (&dot,
while (1) &GRAPHENE_RECT_INIT (xx, yy, hh, hh),
{ hh / 2);
if (o + hs * (1 + HEIGHT_RATIO) >= ww)
break;
gtk_snapshot_append_color (crenderer->snapshot, &rgba, gtk_snapshot_push_rounded_clip (crenderer->snapshot, &dot);
&GRAPHENE_RECT_INIT (xx, yy, hh, hh * HEIGHT_RATIO)); gtk_snapshot_append_color (crenderer->snapshot, &rgba, &dot.bounds);
gtk_snapshot_pop (crenderer->snapshot);
gtk_snapshot_append_color (crenderer->snapshot,
&(GdkRGBA) { 0.f, 0.f, 0.f, 0.f },
&GRAPHENE_RECT_INIT (xx, yy, 1.5 * hh, hh));
xx += hh * (1 - HEIGHT_RATIO); gtk_snapshot_pop (crenderer->snapshot);
yy -= hh * (1 - HEIGHT_RATIO);
o += hs * (1 - HEIGHT_RATIO);
if (o + hs * (1 + HEIGHT_RATIO) >= ww)
break;
gtk_snapshot_append_color (crenderer->snapshot, &rgba,
&GRAPHENE_RECT_INIT (xx, yy, hh * HEIGHT_RATIO, hh));
o += hs * (1 - HEIGHT_RATIO);
}
gtk_snapshot_restore (crenderer->snapshot);
} }
static void static void