Commit c5cfb6e0 authored by Matthias Clasen's avatar Matthias Clasen

Rework the API a bit

Rename get/set_color to get/set_rgba and show_alpha to use_alpha,
to match existing GtkColorButton API and let GtkColorButton implement
GtkColorChooser.
parent 1f68d7d8
This diff is collapsed.
......@@ -73,32 +73,37 @@ struct _GtkColorButtonClass {
};
GType gtk_color_button_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_color_button_new (void);
GtkWidget *gtk_color_button_new_with_rgba (const GdkRGBA *rgba);
void gtk_color_button_set_alpha (GtkColorButton *color_button,
guint16 alpha);
guint16 gtk_color_button_get_alpha (GtkColorButton *color_button);
void gtk_color_button_set_use_alpha (GtkColorButton *color_button,
gboolean use_alpha);
gboolean gtk_color_button_get_use_alpha (GtkColorButton *color_button);
void gtk_color_button_set_rgba (GtkColorButton *color_button,
const GdkRGBA *rgba);
void gtk_color_button_get_rgba (GtkColorButton *color_button,
GdkRGBA *rgba);
void gtk_color_button_set_title (GtkColorButton *color_button,
const gchar *title);
const gchar *gtk_color_button_get_title (GtkColorButton *color_button);
GType gtk_color_button_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_color_button_new (void);
GtkWidget * gtk_color_button_new_with_rgba (const GdkRGBA *rgba);
void gtk_color_button_set_title (GtkColorButton *button,
const gchar *title);
const gchar *gtk_color_button_get_title (GtkColorButton *button);
GDK_DEPRECATED_FOR(gtk_color_button_new_with_rgba)
GtkWidget *gtk_color_button_new_with_color (const GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_button_set_rgba)
void gtk_color_button_set_color (GtkColorButton *color_button,
void gtk_color_button_set_color (GtkColorButton *button,
const GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_button_get_rgba)
void gtk_color_button_get_color (GtkColorButton *color_button,
void gtk_color_button_get_color (GtkColorButton *button,
GdkColor *color);
GDK_DEPRECATED_FOR(gtk_color_button_set_rgba)
void gtk_color_button_set_alpha (GtkColorButton *button,
guint16 alpha);
GDK_DEPRECATED_FOR(gtk_color_button_get_rgba)
guint16 gtk_color_button_get_alpha (GtkColorButton *button);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_use_alpha)
void gtk_color_button_set_use_alpha (GtkColorButton *button,
gboolean use_alpha);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_use_alpha)
gboolean gtk_color_button_get_use_alpha (GtkColorButton *button);
GDK_DEPRECATED_FOR(gtk_color_chooser_set_rgba)
void gtk_color_button_set_rgba (GtkColorButton *button,
const GdkRGBA *rgba);
GDK_DEPRECATED_FOR(gtk_color_chooser_get_rgba)
void gtk_color_button_get_rgba (GtkColorButton *button,
GdkRGBA *rgba);
G_END_DECLS
......
......@@ -40,15 +40,15 @@ static void
gtk_color_chooser_default_init (GtkColorChooserInterface *iface)
{
g_object_interface_install_property (iface,
g_param_spec_boxed ("color",
g_param_spec_boxed ("rgba",
P_("Color"),
P_("Current color, as a GdkRGBA"),
GDK_TYPE_RGBA,
GTK_PARAM_READWRITE));
g_object_interface_install_property (iface,
g_param_spec_boolean ("show-alpha",
P_("Show alpha"),
g_param_spec_boolean ("use-alpha",
P_("Use alpha"),
P_("Whether alpha should be shown"),
TRUE,
GTK_PARAM_READWRITE));
......@@ -75,36 +75,36 @@ gtk_color_chooser_default_init (GtkColorChooserInterface *iface)
}
/**
* gtk_color_chooser_get_color:
* gtk_color_chooser_get_rgba:
* @chooser: a #GtkColorChooser
* @color: return location for the color
*
* Gets the currently-selected color.
*/
void
gtk_color_chooser_get_color (GtkColorChooser *chooser,
GdkRGBA *color)
gtk_color_chooser_get_rgba (GtkColorChooser *chooser,
GdkRGBA *color)
{
g_return_if_fail (GTK_IS_COLOR_CHOOSER (chooser));
GTK_COLOR_CHOOSER_GET_IFACE (chooser)->get_color (chooser, color);
GTK_COLOR_CHOOSER_GET_IFACE (chooser)->get_rgba (chooser, color);
}
/**
* gtk_color_chooser_set_color:
* gtk_color_chooser_set_rgba:
* @chooser: a #GtkColorChooser
* @color: the new color
*
* Sets the currently-selected color.
*/
void
gtk_color_chooser_set_color (GtkColorChooser *chooser,
const GdkRGBA *color)
gtk_color_chooser_set_rgba (GtkColorChooser *chooser,
const GdkRGBA *color)
{
g_return_if_fail (GTK_IS_COLOR_CHOOSER (chooser));
g_return_if_fail (color != NULL);
GTK_COLOR_CHOOSER_GET_IFACE (chooser)->set_color (chooser, color);
GTK_COLOR_CHOOSER_GET_IFACE (chooser)->set_rgba (chooser, color);
}
void
......@@ -117,23 +117,23 @@ _gtk_color_chooser_color_activated (GtkColorChooser *chooser,
}
gboolean
gtk_color_chooser_get_show_alpha (GtkColorChooser *chooser)
gtk_color_chooser_get_use_alpha (GtkColorChooser *chooser)
{
gboolean show_alpha;
gboolean use_alpha;
g_return_val_if_fail (GTK_IS_COLOR_CHOOSER (chooser), TRUE);
g_object_get (chooser, "show-alpha", &show_alpha, NULL);
g_object_get (chooser, "use-alpha", &use_alpha, NULL);
return show_alpha;
return use_alpha;
}
void
gtk_color_chooser_set_show_alpha (GtkColorChooser *chooser,
gboolean show_alpha)
gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
gboolean use_alpha)
{
g_return_if_fail (GTK_IS_COLOR_CHOOSER (chooser));
g_object_set (chooser, "show-alpha", show_alpha, NULL);
g_object_set (chooser, "use-alpha", use_alpha, NULL);
}
......@@ -42,10 +42,10 @@ struct _GtkColorChooserInterface
GTypeInterface base_interface;
/* Methods */
void (* get_color) (GtkColorChooser *chooser,
GdkRGBA *color);
void (* set_color) (GtkColorChooser *chooser,
const GdkRGBA *color);
void (* get_rgba) (GtkColorChooser *chooser,
GdkRGBA *color);
void (* set_rgba) (GtkColorChooser *chooser,
const GdkRGBA *color);
/* Signals */
void (* color_activated) (GtkColorChooser *chooser,
......@@ -57,13 +57,13 @@ struct _GtkColorChooserInterface
GType gtk_color_chooser_get_type (void) G_GNUC_CONST;
void gtk_color_chooser_get_color (GtkColorChooser *chooser,
GdkRGBA *color);
void gtk_color_chooser_set_color (GtkColorChooser *chooser,
const GdkRGBA *color);
gboolean gtk_color_chooser_get_show_alpha (GtkColorChooser *chooser);
void gtk_color_chooser_set_show_alpha (GtkColorChooser *chooser,
gboolean show_alpha);
void gtk_color_chooser_get_rgba (GtkColorChooser *chooser,
GdkRGBA *color);
void gtk_color_chooser_set_rgba (GtkColorChooser *chooser,
const GdkRGBA *color);
gboolean gtk_color_chooser_get_use_alpha (GtkColorChooser *chooser);
void gtk_color_chooser_set_use_alpha (GtkColorChooser *chooser,
gboolean show_alpha);
G_END_DECLS
......
......@@ -45,7 +45,7 @@ struct _GtkColorChooserWidgetPrivate
GtkWidget *button;
GtkColorSwatch *current;
gboolean show_alpha;
gboolean use_alpha;
GtkSizeGroup *size_group;
......@@ -55,8 +55,8 @@ struct _GtkColorChooserWidgetPrivate
enum
{
PROP_ZERO,
PROP_COLOR,
PROP_SHOW_ALPHA,
PROP_RGBA,
PROP_USE_ALPHA,
PROP_SHOW_EDITOR
};
......@@ -78,11 +78,11 @@ select_swatch (GtkColorChooserWidget *cc,
gtk_color_swatch_set_selected (cc->priv->current, FALSE);
gtk_color_swatch_set_selected (swatch, TRUE);
cc->priv->current = swatch;
gtk_color_swatch_get_color (swatch, &color);
gtk_color_swatch_get_rgba (swatch, &color);
g_settings_set (cc->priv->settings, "selected-color", "(bdddd)",
TRUE, color.red, color.green, color.blue, color.alpha);
g_object_notify (G_OBJECT (cc), "color");
g_object_notify (G_OBJECT (cc), "rgba");
}
static void save_custom_colors (GtkColorChooserWidget *cc);
......@@ -99,7 +99,7 @@ button_activate (GtkColorSwatch *swatch,
color.blue = 0.25;
color.alpha = 1.0;
gtk_color_chooser_set_color (GTK_COLOR_CHOOSER (cc->priv->editor), &color);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc->priv->editor), &color);
gtk_widget_hide (cc->priv->palette);
gtk_widget_show (cc->priv->editor);
......@@ -111,7 +111,7 @@ swatch_activate (GtkColorSwatch *swatch,
{
GdkRGBA color;
gtk_color_swatch_get_color (swatch, &color);
gtk_color_swatch_get_rgba (swatch, &color);
_gtk_color_chooser_color_activated (GTK_COLOR_CHOOSER (cc), &color);
}
......@@ -121,8 +121,8 @@ swatch_customize (GtkColorSwatch *swatch,
{
GdkRGBA color;
gtk_color_swatch_get_color (swatch, &color);
gtk_color_chooser_set_color (GTK_COLOR_CHOOSER (cc->priv->editor), &color);
gtk_color_swatch_get_rgba (swatch, &color);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc->priv->editor), &color);
gtk_widget_hide (cc->priv->palette);
gtk_widget_show (cc->priv->editor);
......@@ -173,7 +173,7 @@ save_custom_colors (GtkColorChooserWidget *cc)
while ((child = gtk_grid_get_child_at (GTK_GRID (cc->priv->custom), i, 0)) != NULL)
{
i++;
if (gtk_color_swatch_get_color (GTK_COLOR_SWATCH (child), &color))
if (gtk_color_swatch_get_rgba (GTK_COLOR_SWATCH (child), &color))
{
g_variant_builder_add (&builder, "(dddd)",
color.red, color.green, color.blue, color.alpha);
......@@ -249,7 +249,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
else
gtk_color_swatch_set_corner_radii (GTK_COLOR_SWATCH (p), 1, 1, 1, 1);
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (p), &color);
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (p), &color);
gtk_grid_attach (GTK_GRID (grid), p, i, j, 1, 1);
}
}
......@@ -275,7 +275,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
else
gtk_color_swatch_set_corner_radii (GTK_COLOR_SWATCH (p), 1, 1, 1, 1);
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (p), &color);
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (p), &color);
gtk_grid_attach (GTK_GRID (grid), p, i, 0, 1, 1);
}
......@@ -305,7 +305,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
i++;
p = gtk_color_swatch_new ();
gtk_color_swatch_set_corner_radii (GTK_COLOR_SWATCH (p), 1, 1, 1, 1);
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (p), &color);
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (p), &color);
gtk_color_swatch_set_can_drop (GTK_COLOR_SWATCH (p), TRUE);
connect_custom_signals (p, cc);
gtk_grid_attach (GTK_GRID (grid), p, i, 0, 1, 1);
......@@ -338,7 +338,7 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
&selected,
&color.red, &color.green, &color.blue, &color.alpha);
if (selected)
gtk_color_chooser_set_color (GTK_COLOR_CHOOSER (cc), &color);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc), &color);
gtk_widget_show_all (GTK_WIDGET (cc));
gtk_widget_hide (GTK_WIDGET (cc->priv->editor));
......@@ -363,16 +363,16 @@ gtk_color_chooser_widget_get_property (GObject *object,
switch (prop_id)
{
case PROP_COLOR:
case PROP_RGBA:
{
GdkRGBA color;
gtk_color_chooser_get_color (cc, &color);
gtk_color_chooser_get_rgba (cc, &color);
g_value_set_boxed (value, &color);
}
break;
case PROP_SHOW_ALPHA:
g_value_set_boolean (value, cw->priv->show_alpha);
case PROP_USE_ALPHA:
g_value_set_boolean (value, cw->priv->use_alpha);
break;
case PROP_SHOW_EDITOR:
g_value_set_boolean (value, gtk_widget_get_visible (cw->priv->editor));
......@@ -384,16 +384,16 @@ gtk_color_chooser_widget_get_property (GObject *object,
}
static void
gtk_color_chooser_widget_set_show_alpha (GtkColorChooserWidget *cc,
gboolean show_alpha)
gtk_color_chooser_widget_set_use_alpha (GtkColorChooserWidget *cc,
gboolean use_alpha)
{
GtkWidget *grids[3];
gint i;
GList *children, *l;
GtkWidget *swatch;
cc->priv->show_alpha = show_alpha;
gtk_color_chooser_set_show_alpha (GTK_COLOR_CHOOSER (cc->priv->editor), show_alpha);
cc->priv->use_alpha = use_alpha;
gtk_color_chooser_set_use_alpha (GTK_COLOR_CHOOSER (cc->priv->editor), use_alpha);
grids[0] = cc->priv->colors;
grids[1] = cc->priv->grays;
......@@ -405,7 +405,7 @@ gtk_color_chooser_widget_set_show_alpha (GtkColorChooserWidget *cc,
for (l = children; l; l = l->next)
{
swatch = l->data;
gtk_color_swatch_set_show_alpha (GTK_COLOR_SWATCH (swatch), show_alpha);
gtk_color_swatch_set_use_alpha (GTK_COLOR_SWATCH (swatch), use_alpha);
}
g_list_free (children);
}
......@@ -431,13 +431,13 @@ gtk_color_chooser_widget_set_property (GObject *object,
switch (prop_id)
{
case PROP_COLOR:
gtk_color_chooser_set_color (GTK_COLOR_CHOOSER (cc),
g_value_get_boxed (value));
case PROP_RGBA:
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (cc),
g_value_get_boxed (value));
break;
case PROP_SHOW_ALPHA:
gtk_color_chooser_widget_set_show_alpha (cc,
g_value_get_boolean (value));
case PROP_USE_ALPHA:
gtk_color_chooser_widget_set_use_alpha (cc,
g_value_get_boolean (value));
break;
case PROP_SHOW_EDITOR:
gtk_color_chooser_widget_set_show_editor (cc,
......@@ -469,8 +469,8 @@ gtk_color_chooser_widget_class_init (GtkColorChooserWidgetClass *class)
object_class->set_property = gtk_color_chooser_widget_set_property;
object_class->finalize = gtk_color_chooser_widget_finalize;
g_object_class_override_property (object_class, PROP_COLOR, "color");
g_object_class_override_property (object_class, PROP_SHOW_ALPHA, "show-alpha");
g_object_class_override_property (object_class, PROP_RGBA, "rgba");
g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha");
g_object_class_install_property (object_class, PROP_SHOW_EDITOR,
g_param_spec_boolean ("show-editor", P_("Show editor"), P_("Show editor"),
......@@ -480,15 +480,15 @@ gtk_color_chooser_widget_class_init (GtkColorChooserWidgetClass *class)
}
static void
gtk_color_chooser_widget_get_color (GtkColorChooser *chooser,
GdkRGBA *color)
gtk_color_chooser_widget_get_rgba (GtkColorChooser *chooser,
GdkRGBA *color)
{
GtkColorChooserWidget *cc = GTK_COLOR_CHOOSER_WIDGET (chooser);
if (gtk_widget_get_visible (cc->priv->editor))
gtk_color_chooser_get_color (GTK_COLOR_CHOOSER (cc->priv->editor), color);
gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (cc->priv->editor), color);
else if (cc->priv->current)
gtk_color_swatch_get_color (cc->priv->current, color);
gtk_color_swatch_get_rgba (cc->priv->current, color);
else
{
color->red = 1.0;
......@@ -497,7 +497,7 @@ gtk_color_chooser_widget_get_color (GtkColorChooser *chooser,
color->alpha = 1.0;
}
if (!cc->priv->show_alpha)
if (!cc->priv->use_alpha)
color->alpha = 1.0;
}
......@@ -519,7 +519,7 @@ add_custom_color (GtkColorChooserWidget *cc,
gtk_color_swatch_set_corner_radii (GTK_COLOR_SWATCH (cc->priv->button), 10, 1, 1, 10);
p = gtk_color_swatch_new ();
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (p), color);
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (p), color);
gtk_color_swatch_set_can_drop (GTK_COLOR_SWATCH (p), TRUE);
connect_custom_signals (p, cc);
......@@ -537,8 +537,8 @@ add_custom_color (GtkColorChooserWidget *cc,
}
static void
gtk_color_chooser_widget_set_color (GtkColorChooser *chooser,
const GdkRGBA *color)
gtk_color_chooser_widget_set_rgba (GtkColorChooser *chooser,
const GdkRGBA *color)
{
GtkColorChooserWidget *cc = GTK_COLOR_CHOOSER_WIDGET (chooser);
GList *children, *l;
......@@ -557,8 +557,8 @@ gtk_color_chooser_widget_set_color (GtkColorChooser *chooser,
for (l = children; l; l = l->next)
{
swatch = l->data;
gtk_color_swatch_get_color (swatch, &c);
if (!cc->priv->show_alpha)
gtk_color_swatch_get_rgba (swatch, &c);
if (!cc->priv->use_alpha)
c.alpha = color->alpha;
if (gdk_rgba_equal (color, &c))
{
......@@ -576,8 +576,8 @@ gtk_color_chooser_widget_set_color (GtkColorChooser *chooser,
static void
gtk_color_chooser_widget_iface_init (GtkColorChooserInterface *iface)
{
iface->get_color = gtk_color_chooser_widget_get_color;
iface->set_color = gtk_color_chooser_widget_set_color;
iface->get_rgba = gtk_color_chooser_widget_get_rgba;
iface->set_rgba = gtk_color_chooser_widget_set_rgba;
}
GtkWidget *
......
......@@ -75,14 +75,14 @@ struct _GtkColorEditorPrivate
GtkAdjustment *a_adj;
guint text_changed : 1;
guint show_alpha : 1;
guint use_alpha : 1;
};
enum
{
PROP_ZERO,
PROP_COLOR,
PROP_SHOW_ALPHA
PROP_RGBA,
PROP_USE_ALPHA
};
static void gtk_color_editor_iface_init (GtkColorChooserInterface *iface);
......@@ -135,7 +135,7 @@ entry_apply (GtkWidget *entry,
if (gdk_rgba_parse (&color, text))
{
color.alpha = gtk_adjustment_get_value (editor->priv->a_adj);
gtk_color_chooser_set_color (GTK_COLOR_CHOOSER (editor), &color);
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (editor), &color);
}
editor->priv->text_changed = FALSE;
......@@ -172,9 +172,9 @@ hsv_changed (GtkColorEditor *editor)
gtk_hsv_to_rgb (h, s, v, &color.red, &color.green, &color.blue);
color.alpha = gtk_adjustment_get_value (editor->priv->a_adj);
update_entry (editor);
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (editor->priv->swatch), &color);
gtk_color_scale_set_color (GTK_COLOR_SCALE (editor->priv->a_slider), &color);
g_object_notify (G_OBJECT (editor), "color");
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (editor->priv->swatch), &color);
gtk_color_scale_set_rgba (GTK_COLOR_SCALE (editor->priv->a_slider), &color);
g_object_notify (G_OBJECT (editor), "rgba");
}
static void
......@@ -357,7 +357,7 @@ gtk_color_editor_init (GtkColorEditor *editor)
editor->priv = G_TYPE_INSTANCE_GET_PRIVATE (editor,
GTK_TYPE_COLOR_EDITOR,
GtkColorEditorPrivate);
editor->priv->show_alpha = TRUE;
editor->priv->use_alpha = TRUE;
editor->priv->h_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0);
editor->priv->s_adj = gtk_adjustment_new (0, 0, 1, 0.01, 0.1, 0);
......@@ -529,14 +529,14 @@ gtk_color_editor_get_property (GObject *object,
switch (prop_id)
{
case PROP_COLOR:
case PROP_RGBA:
{
GdkRGBA color;
gtk_color_chooser_get_color (cc, &color);
gtk_color_chooser_get_rgba (cc, &color);
g_value_set_boxed (value, &color);
}
break;
case PROP_SHOW_ALPHA:
case PROP_USE_ALPHA:
g_value_set_boolean (value, gtk_widget_get_visible (ce->priv->a_slider));
break;
default:
......@@ -546,16 +546,14 @@ gtk_color_editor_get_property (GObject *object,
}
static void
gtk_color_editor_set_show_alpha (GtkColorEditor *editor,
gboolean show_alpha)
gtk_color_editor_set_use_alpha (GtkColorEditor *editor,
gboolean use_alpha)
{
if (editor->priv->show_alpha != show_alpha)
if (editor->priv->use_alpha != use_alpha)
{
editor->priv->show_alpha = show_alpha;
gtk_widget_set_visible (editor->priv->a_slider, show_alpha);
gtk_color_swatch_set_show_alpha (GTK_COLOR_SWATCH (editor->priv->swatch), show_alpha);
editor->priv->use_alpha = use_alpha;
gtk_widget_set_visible (editor->priv->a_slider, use_alpha);
gtk_color_swatch_set_use_alpha (GTK_COLOR_SWATCH (editor->priv->swatch), use_alpha);
}
}
......@@ -570,11 +568,11 @@ gtk_color_editor_set_property (GObject *object,
switch (prop_id)
{
case PROP_COLOR:
gtk_color_chooser_set_color (cc, g_value_get_boxed (value));
case PROP_RGBA:
gtk_color_chooser_set_rgba (cc, g_value_get_boxed (value));
break;
case PROP_SHOW_ALPHA:
gtk_color_editor_set_show_alpha (ce, g_value_get_boolean (value));
case PROP_USE_ALPHA:
gtk_color_editor_set_use_alpha (ce, g_value_get_boolean (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
......@@ -604,15 +602,15 @@ gtk_color_editor_class_init (GtkColorEditorClass *class)
object_class->get_property = gtk_color_editor_get_property;
object_class->set_property = gtk_color_editor_set_property;
g_object_class_override_property (object_class, PROP_COLOR, "color");
g_object_class_override_property (object_class, PROP_SHOW_ALPHA, "show-alpha");
g_object_class_override_property (object_class, PROP_RGBA, "rgba");
g_object_class_override_property (object_class, PROP_USE_ALPHA, "use-alpha");
g_type_class_add_private (class, sizeof (GtkColorEditorPrivate));
}
static void
gtk_color_editor_get_color (GtkColorChooser *chooser,
GdkRGBA *color)
gtk_color_editor_get_rgba (GtkColorChooser *chooser,
GdkRGBA *color)
{
GtkColorEditor *editor = GTK_COLOR_EDITOR (chooser);
gdouble h, s, v;
......@@ -625,8 +623,8 @@ gtk_color_editor_get_color (GtkColorChooser *chooser,
}
static void
gtk_color_editor_set_color (GtkColorChooser *chooser,
const GdkRGBA *color)
gtk_color_editor_set_rgba (GtkColorChooser *chooser,
const GdkRGBA *color)
{
GtkColorEditor *editor = GTK_COLOR_EDITOR (chooser);
gdouble h, s, v;
......@@ -637,21 +635,21 @@ gtk_color_editor_set_color (GtkColorChooser *chooser,
gtk_adjustment_set_value (editor->priv->s_adj, s);
gtk_adjustment_set_value (editor->priv->v_adj, v);
gtk_adjustment_set_value (editor->priv->a_adj, color->alpha);
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (editor->priv->swatch), color);
gtk_color_scale_set_color (GTK_COLOR_SCALE (editor->priv->a_slider), color);
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (editor->priv->swatch), color);
gtk_color_scale_set_rgba (GTK_COLOR_SCALE (editor->priv->a_slider), color);
update_entry (editor);
gtk_widget_queue_draw (GTK_WIDGET (editor));
g_object_notify (G_OBJECT (editor), "color");
g_object_notify (G_OBJECT (editor), "rgba");
}
static void
gtk_color_editor_iface_init (GtkColorChooserInterface *iface)
{
iface->get_color = gtk_color_editor_get_color;
iface->set_color = gtk_color_editor_set_color;
iface->get_rgba = gtk_color_editor_get_rgba;
iface->set_rgba = gtk_color_editor_set_rgba;
}
GtkWidget *
......
......@@ -293,8 +293,8 @@ gtk_color_scale_class_init (GtkColorScaleClass *class)
}
void
gtk_color_scale_set_color (GtkColorScale *scale,
const GdkRGBA *color)
gtk_color_scale_set_rgba (GtkColorScale *scale,
const GdkRGBA *color)
{
scale->priv->color.red = color->red;
scale->priv->color.green = color->green;
......
......@@ -65,15 +65,15 @@ typedef enum
} GtkColorScaleType;
G_GNUC_INTERNAL
GType gtk_color_scale_get_type (void) G_GNUC_CONST;
GType gtk_color_scale_get_type (void) G_GNUC_CONST;
G_GNUC_INTERNAL
GtkWidget * gtk_color_scale_new (GtkAdjustment *adjustment,
GtkColorScaleType type);
GtkWidget * gtk_color_scale_new (GtkAdjustment *adjustment,
GtkColorScaleType type);
G_GNUC_INTERNAL
void gtk_color_scale_set_color (GtkColorScale *scale,
const GdkRGBA *color);
void gtk_color_scale_set_rgba (GtkColorScale *scale,
const GdkRGBA *color);
G_END_DECLS
......
......@@ -41,13 +41,13 @@ struct _GtkColorSwatchPrivate
guint has_color : 1;
guint can_drop : 1;
guint contains_pointer : 1;
guint show_alpha : 1;
guint use_alpha : 1;
};
enum
{
PROP_ZERO,
PROP_COLOR,
PROP_RGBA,
PROP_SELECTED
};
......@@ -75,7 +75,7 @@ gtk_color_swatch_init (GtkColorSwatch *swatch)
| GDK_EXPOSURE_MASK
| GDK_ENTER_NOTIFY_MASK
| GDK_LEAVE_NOTIFY_MASK);
swatch->priv->show_alpha = TRUE;
swatch->priv->use_alpha = TRUE;
}
static void
......@@ -146,7 +146,7 @@ swatch_draw (GtkWidget *widget,
cairo_pattern_t *pattern;
cairo_matrix_t matrix;
if (swatch->priv->show_alpha)
if (swatch->priv->use_alpha)
{
cairo_set_source_rgb (cr, 0.33, 0.33, 0.33);
cairo_fill_preserve (cr);
......@@ -251,7 +251,7 @@ swatch_drag_begin (GtkWidget *widget,
GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
GdkRGBA color;
gtk_color_swatch_get_color (swatch, &color);
gtk_color_swatch_get_rgba (swatch, &color);
drag_set_color_icon (context, &color);
}
......@@ -266,7 +266,7 @@ swatch_drag_data_get (GtkWidget *widget,
guint16 vals[4];
GdkRGBA color;
gtk_color_swatch_get_color (swatch, &color);
gtk_color_swatch_get_rgba (swatch, &color);
vals[0] = color.red * 0xffff;
vals[1] = color.green * 0xffff;
......@@ -312,7 +312,7 @@ swatch_drag_data_received (GtkWidget *widget,
color.blue = (gdouble)vals[2] / 0xffff;
color.alpha = (gdouble)vals[3] / 0xffff;
gtk_color_swatch_set_color (GTK_COLOR_SWATCH (widget), &color);
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (widget), &color);
}
static void
......@@ -326,8 +326,8 @@ swatch_get_property (GObject *object,
switch (prop_id)
{
case PROP_COLOR:
gtk_color_swatch_get_color (swatch, &color);
case PROP_RGBA:
gtk_color_swatch_get_rgba (swatch, &color);
g_value_set_boxed (value, &color);
break;
case PROP_SELECTED:
......@@ -349,8 +349,8 @@ swatch_set_property (GObject *object,
switch (prop_id)
{
case PROP_COLOR:
gtk_color_swatch_set_color (swatch, g_value_get_boxed (value));
case PROP_RGBA:
gtk_color_swatch_set_rgba (swatch, g_value_get_boxed (value));
break;
case PROP_SELECTED:
gtk_color_swatch_set_selected (swatch, g_value_get_boolean (value));
......@@ -585,8 +585,8 @@ gtk_color_swatch_class_init (GtkColorSwatchClass *class)
G_STRUCT_OFFSET (GtkColorSwatchClass, customize),
NULL, NULL, NULL, G_TYPE_NONE, 0);
g_object_class_install_property (object_class, PROP_COLOR,
g_param_spec_boxed ("color", P_("Color"), P_("Color"),
g_object_class_install_property (object_class, PROP_RGBA,
g_param_spec_boxed ("rgba", P_("RGBA Color"), P_("Color as RGBA"),
GDK_TYPE_RGBA, GTK_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_SELECTED,
......@@ -606,8 +606,8 @@ gtk_color_swatch_new (void)
}
void
gtk_color_swatch_set_color (GtkColorSwatch *swatch,
const GdkRGBA *color)
gtk_color_swatch_set_rgba (GtkColorSwatch *swatch,
const GdkRGBA *color)
{
static const GtkTargetEntry targets[] = {
{ "application/x-color", 0 }
......@@ -626,12 +626,12 @@ gtk_color_swatch_set_color (GtkColorSwatch *swatch,
swatch->priv->color.alpha = color->alpha;