[gtk/wip/otte/listview-colors: 2/9] gtk-demo: Embed the RGBA value
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/otte/listview-colors: 2/9] gtk-demo: Embed the RGBA value
- Date: Sun, 21 Jun 2020 04:22:53 +0000 (UTC)
commit b4202c98a3099ba98743e4d65072780e74255a26
Author: Benjamin Otte <otte redhat com>
Date: Tue Jun 16 21:11:25 2020 +0200
gtk-demo: Embed the RGBA value
demos/gtk-demo/listview_colors.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/demos/gtk-demo/listview_colors.c b/demos/gtk-demo/listview_colors.c
index 6911b44c8e..dc623c65c8 100644
--- a/demos/gtk-demo/listview_colors.c
+++ b/demos/gtk-demo/listview_colors.c
@@ -23,7 +23,7 @@ struct _GtkColor
GObject parent_instance;
char *name;
- GdkRGBA *color;
+ GdkRGBA color;
int h, s, v;
gboolean selected;
};
@@ -51,7 +51,7 @@ gtk_color_snapshot (GdkPaintable *paintable,
{
GtkColor *self = GTK_COLOR (paintable);
- gtk_snapshot_append_color (snapshot, self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
+ gtk_snapshot_append_color (snapshot, &self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
}
static int
@@ -99,19 +99,19 @@ gtk_color_get_property (GObject *object,
break;
case PROP_COLOR:
- g_value_set_boxed (value, self->color);
+ g_value_set_boxed (value, &self->color);
break;
case PROP_RED:
- g_value_set_float (value, self->color->red);
+ g_value_set_float (value, self->color.red);
break;
case PROP_GREEN:
- g_value_set_float (value, self->color->green);
+ g_value_set_float (value, self->color.green);
break;
case PROP_BLUE:
- g_value_set_float (value, self->color->blue);
+ g_value_set_float (value, self->color.blue);
break;
case PROP_HUE:
@@ -151,7 +151,7 @@ gtk_color_set_property (GObject *object,
break;
case PROP_COLOR:
- self->color = g_value_dup_boxed (value);
+ self->color = *(GdkRGBA *) g_value_dup_boxed (value);
break;
case PROP_HUE:
@@ -182,7 +182,6 @@ gtk_color_finalize (GObject *object)
GtkColor *self = GTK_COLOR (object);
g_free (self->name);
- g_clear_pointer (&self->color, gdk_rgba_free);
G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
}
@@ -370,9 +369,9 @@ get_rgb_markup (gpointer this,
return NULL;
return g_strdup_printf ("<b>R:</b> %d <b>G:</b> %d <b>B:</b> %d",
- (int)(color->color->red * 255),
- (int)(color->color->green * 255),
- (int)(color->color->blue * 255));
+ (int)(color->color.red * 255),
+ (int)(color->color.green * 255),
+ (int)(color->color.blue * 255));
}
static char *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]