diff options
author | Matthias Clasen <mclasen@redhat.com> | 2012-03-07 22:06:22 -0500 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2012-03-07 22:06:22 -0500 |
commit | 19e448146be54ef231ac5250a50a48bb806cd008 (patch) | |
tree | b8366c3925414849b40570d155dfca716e58323c /gtk/gtkcolorchooserdialog.c | |
parent | ad8bf6491c4baf1782e504d925c45c286030ab27 (diff) | |
download | gtk+-19e448146be54ef231ac5250a50a48bb806cd008.tar.gz |
colorchooser: Drop the ::response handler altogether
This makes it safe for users to destroy the dialog in response
to ::response.
Diffstat (limited to 'gtk/gtkcolorchooserdialog.c')
-rw-r--r-- | gtk/gtkcolorchooserdialog.c | 52 |
1 files changed, 33 insertions, 19 deletions
diff --git a/gtk/gtkcolorchooserdialog.c b/gtk/gtkcolorchooserdialog.c index 177224ec74..2610354739 100644 --- a/gtk/gtkcolorchooserdialog.c +++ b/gtk/gtkcolorchooserdialog.c @@ -19,6 +19,7 @@ #include "gtkdialog.h" #include "gtkstock.h" +#include "gtkbutton.h" #include "gtkbox.h" #include "gtkprivate.h" #include "gtkintl.h" @@ -70,10 +71,31 @@ propagate_notify (GObject *o, } static void +save_color (GtkColorChooserDialog *dialog) +{ + GdkRGBA color; + + /* This causes the color chooser widget to save the + * selected and custom colors to GSettings. + */ + gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color); + gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color); +} + +static void color_activated_cb (GtkColorChooser *chooser, GdkRGBA *color, GtkDialog *dialog) { + save_color (GTK_COLOR_CHOOSER_DIALOG (dialog)); + gtk_dialog_response (dialog, GTK_RESPONSE_OK); +} + +static void +selected_cb (GtkButton *button, + GtkDialog *dialog) +{ + save_color (GTK_COLOR_CHOOSER_DIALOG (dialog)); gtk_dialog_response (dialog, GTK_RESPONSE_OK); } @@ -121,9 +143,17 @@ gtk_color_chooser_dialog_init (GtkColorChooserDialog *cc) priv->cancel_button = gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); - priv->select_button = gtk_dialog_add_button (dialog, - _("_Select"), - GTK_RESPONSE_OK); + + /* We emit the response for the Select button manually, + * since we want to save the color first + */ + priv->select_button = gtk_button_new_from_stock (_("_Select")); + g_signal_connect (priv->select_button, "clicked", + G_CALLBACK (selected_cb), dialog); + gtk_widget_set_can_default (priv->select_button, TRUE); + gtk_widget_show (priv->select_button); + gtk_box_pack_end (GTK_BOX (gtk_dialog_get_action_area (dialog)), + priv->select_button, FALSE, TRUE, 0); gtk_widget_grab_default (priv->select_button); gtk_dialog_set_alternative_button_order (dialog, @@ -137,19 +167,6 @@ gtk_color_chooser_dialog_init (GtkColorChooserDialog *cc) } static void -gtk_color_chooser_dialog_response (GtkDialog *dialog, - gint response_id) -{ - if (response_id == GTK_RESPONSE_OK) - { - GdkRGBA color; - - gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (dialog), &color); - gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (dialog), &color); - } -} - -static void gtk_color_chooser_dialog_map (GtkWidget *widget) { /* We never want the dialog to come up with the editor, @@ -229,15 +246,12 @@ gtk_color_chooser_dialog_class_init (GtkColorChooserDialogClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class); - GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (class); object_class->get_property = gtk_color_chooser_dialog_get_property; object_class->set_property = gtk_color_chooser_dialog_set_property; widget_class->map = gtk_color_chooser_dialog_map; - dialog_class->response = gtk_color_chooser_dialog_response; - 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, |