callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk/gtkcolorsel.c: use accessor functions to access GtkWidget

Browse Source
This commit is contained in:
Javier Jardón
2010-08-11 23:14:44 +02:00
parent 42a0a8143b
commit e9b85cf100
1 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkcolorsel.c
View File

@ -814,6 +814,7 @@ color_sample_drag_handle (GtkWidget *widget,
static void static void
color_sample_draw_sample (GtkColorSelection *colorsel, int which) color_sample_draw_sample (GtkColorSelection *colorsel, int which)
{ {
GtkAllocation allocation;
GtkWidget *da; GtkWidget *da;
gint x, y, wid, heig, goff; gint x, y, wid, heig, goff;
ColorSelectionPrivate *priv; ColorSelectionPrivate *priv;
@ -833,14 +834,18 @@ color_sample_draw_sample (GtkColorSelection *colorsel, int which)
} }
else else
{ {
GtkAllocation old_sample_allocation;
da = priv->cur_sample; da = priv->cur_sample;
goff = priv->old_sample->allocation.width % 32; gtk_widget_get_allocation (priv->old_sample, &old_sample_allocation);
goff = old_sample_allocation.width % 32;
} }
cr = gdk_cairo_create (da->window); cr = gdk_cairo_create (gtk_widget_get_window (da));
wid = da->allocation.width; gtk_widget_get_allocation (da, &allocation);
heig = da->allocation.height; wid = allocation.width;
heig = allocation.height;
/* Below needs tweaking for non-power-of-two */ /* Below needs tweaking for non-power-of-two */
@ -1046,26 +1051,32 @@ palette_paint (GtkWidget *drawing_area,
GdkRectangle *area, GdkRectangle *area,
gpointer data) gpointer data)
{ {
GdkWindow *window;
cairo_t *cr; cairo_t *cr;
gint focus_width; gint focus_width;
if (drawing_area->window == NULL) window = gtk_widget_get_window (drawing_area);
if (window == NULL)
return; return;
cr = gdk_cairo_create (drawing_area->window); cr = gdk_cairo_create (window);
gdk_cairo_set_source_color (cr, &drawing_area->style->bg[GTK_STATE_NORMAL]); gdk_cairo_set_source_color (cr, &gtk_widget_get_style (drawing_area)->bg[GTK_STATE_NORMAL]);
gdk_cairo_rectangle (cr, area); gdk_cairo_rectangle (cr, area);
cairo_fill (cr); cairo_fill (cr);
if (gtk_widget_has_focus (drawing_area)) if (gtk_widget_has_focus (drawing_area))
{ {
GtkAllocation allocation;
set_focus_line_attributes (drawing_area, cr, &focus_width); set_focus_line_attributes (drawing_area, cr, &focus_width);
gtk_widget_get_allocation (drawing_area, &allocation);
cairo_rectangle (cr, cairo_rectangle (cr,
focus_width / 2., focus_width / 2., focus_width / 2., focus_width / 2.,
drawing_area->allocation.width - focus_width, allocation.width - focus_width,
drawing_area->allocation.height - focus_width); allocation.height - focus_width);
cairo_stroke (cr); cairo_stroke (cr);
} }
@ -1318,7 +1329,7 @@ palette_expose (GtkWidget *drawing_area,
GdkEventExpose *event, GdkEventExpose *event,
gpointer data) gpointer data)
{ {
if (drawing_area->window == NULL) if (gtk_widget_get_window (drawing_area) == NULL)
return FALSE; return FALSE;
palette_paint (drawing_area, &(event->area), data); palette_paint (drawing_area, &(event->area), data);
@ -1333,6 +1344,7 @@ popup_position_func (GtkMenu *menu,
gboolean *push_in, gboolean *push_in,
gpointer user_data) gpointer user_data)
{ {
GtkAllocation allocation;
GtkWidget *widget; GtkWidget *widget;
GtkRequisition req; GtkRequisition req;
gint root_x, root_y; gint root_x, root_y;
@ -1342,13 +1354,15 @@ popup_position_func (GtkMenu *menu,
g_return_if_fail (gtk_widget_get_realized (widget)); g_return_if_fail (gtk_widget_get_realized (widget));
gdk_window_get_origin (widget->window, &root_x, &root_y); gdk_window_get_origin (gtk_widget_get_window (widget),
&root_x, &root_y);
gtk_widget_size_request (GTK_WIDGET (menu), &req); gtk_widget_size_request (GTK_WIDGET (menu), &req);
gtk_widget_get_allocation (widget, &allocation);
/* Put corner of menu centered on color cell */ /* Put corner of menu centered on color cell */
*x = root_x + widget->allocation.width / 2; *x = root_x + allocation.width / 2;
*y = root_y + widget->allocation.height / 2; *y = root_y + allocation.height / 2;
/* Ensure sanity */ /* Ensure sanity */
screen = gtk_widget_get_screen (widget); screen = gtk_widget_get_screen (widget);
@ -1887,6 +1901,7 @@ get_screen_color (GtkWidget *button)
GdkDevice *device, *keyb_device, *pointer_device; GdkDevice *device, *keyb_device, *pointer_device;
GdkCursor *picker_cursor; GdkCursor *picker_cursor;
GdkGrabStatus grab_status; GdkGrabStatus grab_status;
GdkWindow *window;
GtkWidget *grab_widget, *toplevel; GtkWidget *grab_widget, *toplevel;
guint32 time = gtk_get_current_event_time (); guint32 time = gtk_get_current_event_time ();
@ -1927,8 +1942,10 @@ get_screen_color (GtkWidget *button)
priv->dropper_grab_widget = grab_widget; priv->dropper_grab_widget = grab_widget;
} }
window = gtk_widget_get_window (priv->dropper_grab_widget);
if (gdk_device_grab (keyb_device, if (gdk_device_grab (keyb_device,
priv->dropper_grab_widget->window, window,
GDK_OWNERSHIP_APPLICATION, FALSE, GDK_OWNERSHIP_APPLICATION, FALSE,
GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
NULL, time) != GDK_GRAB_SUCCESS) NULL, time) != GDK_GRAB_SUCCESS)
@ -1936,7 +1953,7 @@ get_screen_color (GtkWidget *button)
picker_cursor = make_picker_cursor (screen); picker_cursor = make_picker_cursor (screen);
grab_status = gdk_device_grab (pointer_device, grab_status = gdk_device_grab (pointer_device,
priv->dropper_grab_widget->window, window,
GDK_OWNERSHIP_APPLICATION, GDK_OWNERSHIP_APPLICATION,
FALSE, FALSE,
GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK, GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK | GDK_POINTER_MOTION_MASK,