diff options
| author | Timm Bäder <mail@baedert.org> | 2019-08-11 08:34:43 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2019-08-11 09:34:50 +0200 |
| commit | 6f1cade817337004c458c8b12a7b50f1e73c4147 (patch) | |
| tree | 98ee84697dbcc44a4a2e7b4afd0dd68eee19f177 /gtk/gtkcolorswatch.c | |
| parent | c6961f1b6160a7ce12190e769dc4adc738f1e493 (diff) | |
| download | gtk+-6f1cade817337004c458c8b12a7b50f1e73c4147.tar.gz | |
color chooser: Port checkered pattern drawing from cairo
Diffstat (limited to 'gtk/gtkcolorswatch.c')
| -rw-r--r-- | gtk/gtkcolorswatch.c | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c index d17093fe9a..b44487774a 100644 --- a/gtk/gtkcolorswatch.c +++ b/gtk/gtkcolorswatch.c @@ -85,40 +85,18 @@ swatch_snapshot (GtkWidget *widget, { GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget); GtkColorSwatchPrivate *priv = gtk_color_swatch_get_instance_private (swatch); + const int width = gtk_widget_get_width (widget); + const int height = gtk_widget_get_height (widget); if (priv->has_color) { - cairo_pattern_t *pattern; - cairo_matrix_t matrix; - if (priv->use_alpha && !gdk_rgba_is_opaque (&priv->color)) { - cairo_t *cr; - - cr = gtk_snapshot_append_cairo (snapshot, - &GRAPHENE_RECT_INIT ( - 0, 0, - gtk_widget_get_width (widget), - gtk_widget_get_height (widget))); - cairo_set_source_rgb (cr, 0.33, 0.33, 0.33); - cairo_paint (cr); - - pattern = _gtk_color_chooser_get_checkered_pattern (); - cairo_matrix_init_scale (&matrix, 0.125, 0.125); - cairo_pattern_set_matrix (pattern, &matrix); - - cairo_set_source_rgb (cr, 0.66, 0.66, 0.66); - cairo_mask (cr, pattern); - cairo_pattern_destroy (pattern); - - cairo_destroy (cr); + _gtk_color_chooser_snapshot_checkered_pattern (snapshot, width, height); gtk_snapshot_append_color (snapshot, &priv->color, - &GRAPHENE_RECT_INIT ( - 0, 0, - gtk_widget_get_width (widget), - gtk_widget_get_height (widget))); + &GRAPHENE_RECT_INIT (0, 0, width, height)); } else { @@ -128,10 +106,7 @@ swatch_snapshot (GtkWidget *widget, gtk_snapshot_append_color (snapshot, &color, - &GRAPHENE_RECT_INIT ( - 0, 0, - gtk_widget_get_width (widget), - gtk_widget_get_height (widget))); + &GRAPHENE_RECT_INIT (0, 0, width, height)); } } |