AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-19 08:30:09 +00:00
Code Issues Projects Releases Wiki Activity

colorbutton: Connect to draw event

Browse Source
This commit is contained in:
Benjamin Otte 2010-09-08 17:58:45 +02:00
parent 5f771c8a9f
commit 8f2fdec7d6
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkcolorbutton.c
View File

@ -263,25 +263,15 @@ gtk_color_button_get_checkered (void)
/* Handle exposure events for the color picker's drawing area */
static gint
expose_event (GtkWidget *widget,
GdkEventExpose *event,
gpointer data)
gtk_color_button_draw_cb (GtkWidget *widget,
cairo_t *cr,
gpointer data)
{
GtkColorButton *color_button = GTK_COLOR_BUTTON (data);
GtkAllocation allocation;
cairo_pattern_t *checkered;
cairo_t *cr;
cr = gdk_cairo_create (event->window);
gtk_widget_get_allocation (widget, &allocation);
gdk_cairo_rectangle (cr, &allocation);
cairo_clip (cr);
if (gtk_color_button_has_alpha (color_button))
{
cairo_save (cr);
cairo_set_source_rgb (cr, CHECK_DARK, CHECK_DARK, CHECK_DARK);
cairo_paint (cr);
@ -292,8 +282,6 @@ expose_event (GtkWidget *widget,
cairo_mask (cr, checkered);
cairo_pattern_destroy (checkered);
cairo_restore (cr);
cairo_set_source_rgba (cr,
color_button->priv->color.red / 65535.,
color_button->priv->color.green / 65535.,
@ -315,8 +303,6 @@ expose_event (GtkWidget *widget,
cairo_pattern_destroy (checkered);
}
cairo_destroy (cr);
return FALSE;
}
@ -451,8 +437,8 @@ gtk_color_button_init (GtkColorButton *color_button)
g_object_unref (layout);
gtk_widget_set_size_request (color_button->priv->draw_area, rect.width - 2, rect.height - 2);
g_signal_connect (color_button->priv->draw_area, "expose-event",
G_CALLBACK (expose_event), color_button);
g_signal_connect (color_button->priv->draw_area, "draw",
G_CALLBACK (gtk_color_button_draw_cb), color_button);
gtk_container_add (GTK_CONTAINER (frame), color_button->priv->draw_area);
gtk_widget_show (color_button->priv->draw_area);