return;
if (cc->priv->current != NULL)
- gtk_color_swatch_set_selected (cc->priv->current, FALSE);
- gtk_color_swatch_set_selected (swatch, TRUE);
+ gtk_widget_unset_state_flags (GTK_WIDGET (cc->priv->current), GTK_STATE_FLAG_SELECTED);
+ gtk_widget_set_state_flags (GTK_WIDGET (swatch), GTK_STATE_FLAG_SELECTED, FALSE);
cc->priv->current = swatch;
gtk_color_swatch_get_rgba (swatch, &color);
static void
swatch_selected (GtkColorSwatch *swatch,
- GParamSpec *pspec,
+ GtkStateFlags previous,
GtkColorChooserWidget *cc)
{
- select_swatch (cc, swatch);
+ GtkStateFlags flags;
+
+ flags = gtk_widget_get_state_flags (GTK_WIDGET (swatch));
+ if ((flags & GTK_STATE_FLAG_SELECTED) != (previous & GTK_STATE_FLAG_SELECTED) &&
+ (flags & GTK_STATE_FLAG_SELECTED) != 0)
+ select_swatch (cc, swatch);
}
static void
{
g_signal_connect (p, "activate", G_CALLBACK (swatch_activate), data);
g_signal_connect (p, "customize", G_CALLBACK (swatch_customize), data);
- g_signal_connect (p, "notify::selected", G_CALLBACK (swatch_selected), data);
+ g_signal_connect (p, "state-flags-changed", G_CALLBACK (swatch_selected), data);
}
static void
GdkRGBA color;
gdouble radius[4];
gchar *icon;
- guint selected : 1;
guint has_color : 1;
guint contains_pointer : 1;
guint use_alpha : 1;
GTK_ICON_LOOKUP_GENERIC_FALLBACK
| GTK_ICON_LOOKUP_USE_BUILTIN);
}
- else if (swatch->priv->selected)
+ else if ((state & GTK_STATE_FLAG_SELECTED) != 0)
{
GdkRGBA bg, border;
GtkBorder border_width;
event->keyval == GDK_KEY_KP_Enter ||
event->keyval == GDK_KEY_KP_Space)
{
- if (swatch->priv->has_color && !swatch->priv->selected)
- gtk_color_swatch_set_selected (swatch, TRUE);
+ if (swatch->priv->has_color && (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_SELECTED) == 0)
+ gtk_widget_set_state_flags (widget, GTK_STATE_FLAG_SELECTED, FALSE);
else
g_signal_emit (swatch, signals[ACTIVATE], 0);
return TRUE;
GdkEventButton *event)
{
GtkColorSwatch *swatch = GTK_COLOR_SWATCH (widget);
+ GtkStateFlags flags;
if (event->button == GDK_BUTTON_PRIMARY &&
swatch->priv->contains_pointer)
{
+ flags = gtk_widget_get_state_flags (widget);
if (!swatch->priv->has_color)
{
g_signal_emit (swatch, signals[ACTIVATE], 0);
return TRUE;
}
- else if (!swatch->priv->selected)
+ else if ((flags & GTK_STATE_FLAG_SELECTED) == 0)
{
- gtk_color_swatch_set_selected (swatch, TRUE);
+ gtk_widget_set_state_flags (widget, GTK_STATE_FLAG_SELECTED, FALSE);
return TRUE;
}
}
gtk_color_swatch_get_rgba (swatch, &color);
g_value_set_boxed (value, &color);
break;
- case PROP_SELECTED:
- g_value_set_boolean (value, swatch->priv->selected);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
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));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
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,
- g_param_spec_boolean ("selected", P_("Selected"), P_("Selected"),
- FALSE, GTK_PARAM_READWRITE));
-
g_type_class_add_private (object_class, sizeof (GtkColorSwatchPrivate));
}
}
}
-void
-gtk_color_swatch_set_selected (GtkColorSwatch *swatch,
- gboolean selected)
-{
- if (swatch->priv->selected != selected)
- {
- swatch->priv->selected = selected;
- gtk_widget_queue_draw (GTK_WIDGET (swatch));
- g_object_notify (G_OBJECT (swatch), "selected");
- }
-}
-
void
gtk_color_swatch_set_icon (GtkColorSwatch *swatch,
const gchar *icon)