X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-cell-renderer-button.c;h=e801cc6bf30ba6c1e8e42b7e1d40ee45e6bf8f70;hb=ecad37996f533d5cd8348ad68659470e821f5ebd;hp=8bf90a24c68d19997bc8d29bc9900f5420fb8db3;hpb=0fe886a656b0ee57b4d542b7c16b3c56288b6fc6;p=pspp diff --git a/src/ui/gui/psppire-cell-renderer-button.c b/src/ui/gui/psppire-cell-renderer-button.c index 8bf90a24c6..e801cc6bf3 100644 --- a/src/ui/gui/psppire-cell-renderer-button.c +++ b/src/ui/gui/psppire-cell-renderer-button.c @@ -27,10 +27,11 @@ #include "gl/configmake.h" #include "gl/relocatable.h" -#include "gettext.h" -#define _(msgid) gettext (msgid) +G_GNUC_BEGIN_IGNORE_DEPRECATIONS -static void psppire_cell_renderer_button_destroy (GtkObject *); +#define P_(msgid) (msgid) + +static void psppire_cell_renderer_button_dispose (GObject *); static void psppire_cell_renderer_button_finalize (GObject *); static void update_style_cache (PsppireCellRendererButton *button, @@ -70,15 +71,14 @@ psppire_cell_renderer_button_set_property (GObject *object, GParamSpec *pspec) { PsppireCellRendererButton *obj = PSPPIRE_CELL_RENDERER_BUTTON (object); - switch (prop_id) { case PROP_EDITABLE: obj->editable = g_value_get_boolean (value); if (obj->editable) - GTK_CELL_RENDERER (obj)->mode = GTK_CELL_RENDERER_MODE_EDITABLE; + g_object_set (obj, "mode", GTK_CELL_RENDERER_MODE_EDITABLE, NULL); else - GTK_CELL_RENDERER (obj)->mode = GTK_CELL_RENDERER_MODE_INERT; + g_object_set (obj, "mode", GTK_CELL_RENDERER_MODE_INERT, NULL); break; case PROP_LABEL: @@ -134,13 +134,6 @@ on_style_set (GtkWidget *base, update_style_cache (button, NULL); } -static void -on_destroy (GtkObject *base, - PsppireCellRendererButton *button) -{ - update_style_cache (button, NULL); -} - static void update_style_cache (PsppireCellRendererButton *button, GtkWidget *widget) @@ -167,11 +160,6 @@ update_style_cache (PsppireCellRendererButton *button, button->style_set_handler); button->style_set_handler = 0; } - if (button->destroy_handler) - { - g_signal_handler_disconnect (button->base, button->destroy_handler); - button->destroy_handler = 0; - } g_object_unref (button->base); button->base = NULL; } @@ -186,10 +174,6 @@ update_style_cache (PsppireCellRendererButton *button, button->style_set_handler = g_signal_connect (widget, "style-set", G_CALLBACK (on_style_set), button); - button->destroy_handler = g_signal_connect (widget, "destroy", - G_CALLBACK (on_destroy), - button); - g_object_ref (widget); g_object_ref (button->button_style); g_object_ref (button->label_style); @@ -198,17 +182,17 @@ update_style_cache (PsppireCellRendererButton *button, static void psppire_cell_renderer_button_render (GtkCellRenderer *cell, - GdkDrawable *window, + cairo_t *cr, GtkWidget *widget, - GdkRectangle *background_area, - GdkRectangle *cell_area, - GdkRectangle *expose_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags) { - PsppireCellRendererButton *button = PSPPIRE_CELL_RENDERER_BUTTON (cell); GtkStateType state_type; + PsppireCellRendererButton *button = PSPPIRE_CELL_RENDERER_BUTTON (cell); + gfloat xalign, yalign; - if (!button->editable || !cell->sensitive) + if (!button->editable || ! gtk_cell_renderer_get_sensitive (cell)) state_type = GTK_STATE_INSENSITIVE; else if (flags & GTK_CELL_RENDERER_SELECTED) { @@ -221,31 +205,42 @@ psppire_cell_renderer_button_render (GtkCellRenderer *cell, state_type = GTK_STATE_PRELIGHT; else { - if (gtk_widget_get_state (widget) == GTK_STATE_INSENSITIVE) + if (gtk_widget_get_state_flags (widget) == GTK_STATE_FLAG_INSENSITIVE) state_type = GTK_STATE_INSENSITIVE; else state_type = GTK_STATE_NORMAL; } + gtk_cell_renderer_get_alignment (cell, &xalign, &yalign); + + update_style_cache (button, widget); - facade_button_render (widget, window, expose_area, + + facade_button_render (widget, cr, cell_area, button->border_width, button->button_style, state_type, button->label_style, button->label, button->xpad, - button->ypad, cell->xalign, cell->yalign); + button->ypad, xalign, yalign); if (button->slash) - gdk_draw_line (window, button->button_style->black_gc, - cell_area->x, - cell_area->y + cell_area->height, - cell_area->x + cell_area->width, - cell_area->y); + { + cairo_set_line_width (cr, 1.0); + cairo_set_line_cap (cr, CAIRO_LINE_CAP_SQUARE); + cairo_move_to (cr, + cell_area->x, + cell_area->y + cell_area->height); + + cairo_line_to (cr, + cell_area->x + cell_area->width, + cell_area->y); + cairo_stroke (cr); + } } static void psppire_cell_renderer_button_get_size (GtkCellRenderer *cell, GtkWidget *widget, - GdkRectangle *cell_area, + const GdkRectangle *cell_area, gint *x_offset, gint *y_offset, gint *width, @@ -308,25 +303,6 @@ psppire_cell_renderer_button_clicked (GtkButton *button, g_free (path); } -static gboolean -psppire_cell_renderer_button_focus_out_event (GtkWidget *widget, - GdkEvent *event, - gpointer data) -{ - PsppireCellRendererButton *cell_button = data; - - g_signal_handlers_disconnect_by_func (widget, - psppire_cell_renderer_button_focus_out_event, - data); - g_signal_handlers_disconnect_by_func (widget, - psppire_cell_renderer_button_clicked, - data); - - gtk_cell_renderer_stop_editing (GTK_CELL_RENDERER (cell_button), FALSE); - - return FALSE; -} - #define IDLE_ID_STRING "psppire-cell-renderer-button-idle-id" static gboolean @@ -334,8 +310,8 @@ psppire_cell_renderer_button_initial_click (gpointer data) { GtkButton *button = data; - gtk_button_clicked (button); g_object_steal_data (G_OBJECT (button), IDLE_ID_STRING); + gtk_button_clicked (button); return FALSE; } @@ -375,7 +351,17 @@ psppire_cell_renderer_button_press_event (GtkButton *button, /* Allow right-click events to propagate upward in the widget hierarchy. Otherwise right-click menus, that trigger on a button-press-event on the containing PsppSheetView, will pop up if the button is rendered as - a facade but not if the button widget exists. */ + a facade but not if the button widget exists. + + We have to translate the event's data by hand to be relative to the + parent window, because the normal GObject signal propagation mechanism + won't do it for us. (This might be a hint that we're doing this + wrong.) */ + gint x, y; + + gdk_window_get_position (event->window, &x, &y); + event->x += x; + event->y += y; g_signal_stop_emission_by_name (button, "button-press-event"); return FALSE; } @@ -419,8 +405,8 @@ psppire_cell_renderer_button_start_editing (GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path, - GdkRectangle *background_area, - GdkRectangle *cell_area, + const GdkRectangle *background_area, + const GdkRectangle *cell_area, GtkCellRendererState flags) { PsppireCellRendererButton *cell_button = PSPPIRE_CELL_RENDERER_BUTTON (cell); @@ -432,12 +418,8 @@ psppire_cell_renderer_button_start_editing (GtkCellRenderer *cell, "xalign", xalign, "yalign", yalign, "path", path, - "slash", cell_button->slash, NULL); - g_signal_connect (G_OBJECT (cell_button->button), "focus-out-event", - G_CALLBACK (psppire_cell_renderer_button_focus_out_event), - cell); g_signal_connect (G_OBJECT (cell_button->button), "clicked", G_CALLBACK (psppire_cell_renderer_button_clicked), cell); @@ -476,14 +458,12 @@ static void psppire_cell_renderer_button_class_init (PsppireCellRendererButtonClass *class) { GObjectClass *gobject_class = G_OBJECT_CLASS (class); - GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (class); GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (class); gobject_class->set_property = psppire_cell_renderer_button_set_property; gobject_class->get_property = psppire_cell_renderer_button_get_property; gobject_class->finalize = psppire_cell_renderer_button_finalize; - - gtk_object_class->destroy = psppire_cell_renderer_button_destroy; + gobject_class->dispose = psppire_cell_renderer_button_dispose; cell_class->get_size = psppire_cell_renderer_button_get_size; cell_class->render = psppire_cell_renderer_button_render; @@ -510,24 +490,24 @@ psppire_cell_renderer_button_class_init (PsppireCellRendererButtonClass *class) g_object_class_install_property (gobject_class, PROP_EDITABLE, g_param_spec_boolean ("editable", - "Editable", - "Whether the button may be clicked.", + P_("Editable"), + P_("Whether the button may be clicked."), FALSE, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_LABEL, g_param_spec_string ("label", - "Label", - "Text to appear in button.", + P_("Label"), + P_("Text to appear in button."), "", G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_SLASH, g_param_spec_boolean ("slash", - _("Diagonal slash"), - _("Whether to draw a diagonal slash across the button."), + P_("Diagonal slash"), + P_("Whether to draw a diagonal slash across the button."), FALSE, G_PARAM_READWRITE)); @@ -550,7 +530,7 @@ psppire_cell_renderer_button_init (PsppireCellRendererButton *obj) obj->label_style = NULL; obj->base = NULL; obj->style_set_handler = 0; - obj->destroy_handler = 0; + obj->dispose_has_run = FALSE; } static void @@ -562,13 +542,20 @@ psppire_cell_renderer_button_finalize (GObject *obj) } static void -psppire_cell_renderer_button_destroy (GtkObject *obj) +psppire_cell_renderer_button_dispose (GObject *obj) { PsppireCellRendererButton *button = PSPPIRE_CELL_RENDERER_BUTTON (obj); + if (button->dispose_has_run) + return; + + button->dispose_has_run = TRUE; + + /* When called with NULL, as we are doing here, update_style_cache + does nothing more than to drop references */ update_style_cache (button, NULL); - GTK_OBJECT_CLASS (psppire_cell_renderer_button_parent_class)->destroy (obj); + G_OBJECT_CLASS (psppire_cell_renderer_button_parent_class)->dispose (obj); } GtkCellRenderer *