diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-09-12 09:16:42 -0400 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2020-09-18 15:39:07 +0200 |
| commit | 2886e19772b99fff4ce1c4cefc8a6c5379333cdf (patch) | |
| tree | 556e8311d2fbf94b441ebe60c8d888aab64ec243 | |
| parent | c08df82d547aa930da3dd7ca672e225e4b5884f4 (diff) | |
| download | gtk+-2886e19772b99fff4ce1c4cefc8a6c5379333cdf.tar.gz | |
css: switch to h/vradius
| -rw-r--r-- | gtk/gtkcssimageradial.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/gtk/gtkcssimageradial.c b/gtk/gtkcssimageradial.c index 60208bef07..6d7980dc1a 100644 --- a/gtk/gtkcssimageradial.c +++ b/gtk/gtkcssimageradial.c @@ -82,7 +82,7 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, GtkCssImageRadial *radial = GTK_CSS_IMAGE_RADIAL (image); GskColorStop *stops; double x, y; - double radius, yscale; + double hradius, vradius; double start, end; double r1, r2, r3, r4, r; double offset; @@ -96,13 +96,13 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, switch (radial->size) { case GTK_CSS_EXPLICIT_SIZE: - radius = _gtk_css_number_value_get (radial->sizes[0], width); + hradius = _gtk_css_number_value_get (radial->sizes[0], width); break; case GTK_CSS_CLOSEST_SIDE: - radius = MIN (MIN (x, width - x), MIN (y, height - y)); + hradius = MIN (MIN (x, width - x), MIN (y, height - y)); break; case GTK_CSS_FARTHEST_SIDE: - radius = MAX (MAX (x, width - x), MAX (y, height - y)); + hradius = MAX (MAX (x, width - x), MAX (y, height - y)); break; case GTK_CSS_CLOSEST_CORNER: case GTK_CSS_FARTHEST_CORNER: @@ -114,19 +114,17 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, r = MIN ( MIN (r1, r2), MIN (r3, r4)); else r = MAX ( MAX (r1, r2), MAX (r3, r4)); - radius = sqrt (r); + hradius = sqrt (r); break; default: g_assert_not_reached (); } - radius = MAX (1.0, radius); - yscale = 1.0; + hradius = MAX (1.0, hradius); + vradius = hradius; } else { - double hradius, vradius; - switch (radial->size) { case GTK_CSS_EXPLICIT_SIZE: @@ -155,12 +153,9 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, hradius = MAX (1.0, hradius); vradius = MAX (1.0, vradius); - - radius = hradius; - yscale = vradius / hradius; } - gtk_css_image_radial_get_start_end (radial, radius, &start, &end); + gtk_css_image_radial_get_start_end (radial, hradius, &start, &end); offset = start; last = -1; @@ -181,12 +176,9 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, continue; } else - { - pos = _gtk_css_number_value_get (stop->offset, radius) / radius; - pos = CLAMP (pos, 0.0, 1.0); - } + pos = _gtk_css_number_value_get (stop->offset, hradius) / hradius; - pos = MAX (pos, offset); + pos = MAX (pos, 0); step = (pos - offset) / (i - last); for (last = last + 1; last <= i; last++) { @@ -206,8 +198,8 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, gtk_snapshot_append_repeating_radial_gradient (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height), &GRAPHENE_POINT_INIT (x, y), - radius, - yscale, + hradius, + vradius, start, end, stops, @@ -216,8 +208,8 @@ gtk_css_image_radial_snapshot (GtkCssImage *image, gtk_snapshot_append_radial_gradient (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height), &GRAPHENE_POINT_INIT (x, y), - radius, - yscale, + hradius, + vradius, start, end, stops, |