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

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

Browse Source
This commit is contained in:
Javier Jardón
2010-08-11 23:03:15 +02:00
parent c35fa9bc5a
commit c6f4e71a31
1 changed files with 94 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
gtk/gtkrange.c
View File

@ -1513,7 +1513,7 @@ gtk_range_size_allocate (GtkWidget *widget,
range = GTK_RANGE (widget); range = GTK_RANGE (widget);
widget->allocation = *allocation; gtk_widget_set_allocation (widget, allocation);
range->layout->recalc_marks = TRUE; range->layout->recalc_marks = TRUE;
@ -1522,16 +1522,16 @@ gtk_range_size_allocate (GtkWidget *widget,
if (gtk_widget_get_realized (widget)) if (gtk_widget_get_realized (widget))
gdk_window_move_resize (range->event_window, gdk_window_move_resize (range->event_window,
widget->allocation.x, allocation->x, allocation->y,
widget->allocation.y, allocation->width, allocation->height);
widget->allocation.width,
widget->allocation.height);
} }
static void static void
gtk_range_realize (GtkWidget *widget) gtk_range_realize (GtkWidget *widget)
{ {
GtkAllocation allocation;
GtkRange *range; GtkRange *range;
GdkWindow *window;
GdkWindowAttr attributes; GdkWindowAttr attributes;
gint attributes_mask; gint attributes_mask;
@ -1541,14 +1541,17 @@ gtk_range_realize (GtkWidget *widget)
gtk_widget_set_realized (widget, TRUE); gtk_widget_set_realized (widget, TRUE);
widget->window = gtk_widget_get_parent_window (widget); window = gtk_widget_get_parent_window (widget);
g_object_ref (widget->window); gtk_widget_set_window (widget, window);
g_object_ref (window);
gtk_widget_get_allocation (widget, &allocation);
attributes.window_type = GDK_WINDOW_CHILD; attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x; attributes.x = allocation.x;
attributes.y = widget->allocation.y; attributes.y = allocation.y;
attributes.width = widget->allocation.width; attributes.width = allocation.width;
attributes.height = widget->allocation.height; attributes.height = allocation.height;
attributes.wclass = GDK_INPUT_ONLY; attributes.wclass = GDK_INPUT_ONLY;
attributes.event_mask = gtk_widget_get_events (widget); attributes.event_mask = gtk_widget_get_events (widget);
attributes.event_mask |= (GDK_BUTTON_PRESS_MASK | attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
@ -1564,7 +1567,7 @@ gtk_range_realize (GtkWidget *widget)
&attributes, attributes_mask); &attributes, attributes_mask);
gdk_window_set_user_data (range->event_window, range); gdk_window_set_user_data (range->event_window, range);
widget->style = gtk_style_attach (widget->style, widget->window); gtk_widget_style_attach (widget);
} }
static void static void
@ -1704,10 +1707,13 @@ draw_stepper (GtkRange *range,
gboolean prelighted, gboolean prelighted,
GdkRectangle *area) GdkRectangle *area)
{ {
GtkAllocation allocation;
GtkStateType state_type; GtkStateType state_type;
GtkShadowType shadow_type; GtkShadowType shadow_type;
GdkRectangle intersection; GtkStyle *style;
GtkWidget *widget = GTK_WIDGET (range); GtkWidget *widget = GTK_WIDGET (range);
GdkRectangle intersection;
GdkWindow *window;
gfloat arrow_scaling; gfloat arrow_scaling;
GdkRectangle *rect; GdkRectangle *rect;
gint arrow_x; gint arrow_x;
@ -1739,8 +1745,10 @@ draw_stepper (GtkRange *range,
if (!gdk_rectangle_intersect (area, rect, &intersection)) if (!gdk_rectangle_intersect (area, rect, &intersection))
return; return;
intersection.x += widget->allocation.x; gtk_widget_get_allocation (widget, &allocation);
intersection.y += widget->allocation.y;
intersection.x += allocation.x;
intersection.y += allocation.y;
if ((!range->inverted && (arrow_type == GTK_ARROW_DOWN || if ((!range->inverted && (arrow_type == GTK_ARROW_DOWN ||
arrow_type == GTK_ARROW_RIGHT)) || arrow_type == GTK_ARROW_RIGHT)) ||
@ -1768,13 +1776,15 @@ draw_stepper (GtkRange *range,
else else
shadow_type = GTK_SHADOW_OUT; shadow_type = GTK_SHADOW_OUT;
gtk_paint_box (widget->style, style = gtk_widget_get_style (widget);
widget->window, window = gtk_widget_get_window (widget);
gtk_paint_box (style, window,
state_type, shadow_type, state_type, shadow_type,
&intersection, widget, &intersection, widget,
gtk_range_get_stepper_detail (range, stepper), gtk_range_get_stepper_detail (range, stepper),
widget->allocation.x + rect->x, allocation.x + rect->x,
widget->allocation.y + rect->y, allocation.y + rect->y,
rect->width, rect->width,
rect->height); rect->height);
@ -1782,8 +1792,8 @@ draw_stepper (GtkRange *range,
arrow_width = rect->width * arrow_scaling; arrow_width = rect->width * arrow_scaling;
arrow_height = rect->height * arrow_scaling; arrow_height = rect->height * arrow_scaling;
arrow_x = widget->allocation.x + rect->x + (rect->width - arrow_width) / 2; arrow_x = allocation.x + rect->x + (rect->width - arrow_width) / 2;
arrow_y = widget->allocation.y + rect->y + (rect->height - arrow_height) / 2; arrow_y = allocation.y + rect->y + (rect->height - arrow_height) / 2;
if (clicked && arrow_sensitive) if (clicked && arrow_sensitive)
{ {
@ -1798,8 +1808,7 @@ draw_stepper (GtkRange *range,
arrow_y += arrow_displacement_y; arrow_y += arrow_displacement_y;
} }
gtk_paint_arrow (widget->style, gtk_paint_arrow (style, window,
widget->window,
state_type, shadow_type, state_type, shadow_type,
&intersection, widget, &intersection, widget,
gtk_range_get_stepper_detail (range, stepper), gtk_range_get_stepper_detail (range, stepper),
@ -1812,12 +1821,15 @@ static gboolean
gtk_range_expose (GtkWidget *widget, gtk_range_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
GtkAllocation allocation;
GtkRange *range = GTK_RANGE (widget); GtkRange *range = GTK_RANGE (widget);
gboolean sensitive; gboolean sensitive;
GtkStateType state; GtkStateType state;
GtkShadowType shadow_type; GtkShadowType shadow_type;
GtkStyle *style;
GdkRectangle expose_area; /* Relative to widget->allocation */ GdkRectangle expose_area; /* Relative to widget->allocation */
GdkRectangle area; GdkRectangle area;
GdkWindow *window;
gint focus_line_width = 0; gint focus_line_width = 0;
gint focus_padding = 0; gint focus_padding = 0;
gboolean touchscreen; gboolean touchscreen;
@ -1825,20 +1837,26 @@ gtk_range_expose (GtkWidget *widget,
g_object_get (gtk_widget_get_settings (widget), g_object_get (gtk_widget_get_settings (widget),
"gtk-touchscreen-mode", &touchscreen, "gtk-touchscreen-mode", &touchscreen,
NULL); NULL);
style = gtk_widget_get_style (widget);
if (gtk_widget_get_can_focus (GTK_WIDGET (range))) if (gtk_widget_get_can_focus (GTK_WIDGET (range)))
gtk_widget_style_get (GTK_WIDGET (range), gtk_widget_style_get (GTK_WIDGET (range),
"focus-line-width", &focus_line_width, "focus-line-width", &focus_line_width,
"focus-padding", &focus_padding, "focus-padding", &focus_padding,
NULL); NULL);
window = gtk_widget_get_window (widget);
/* we're now exposing, so there's no need to force early repaints */ /* we're now exposing, so there's no need to force early repaints */
if (range->layout->repaint_id) if (range->layout->repaint_id)
g_source_remove (range->layout->repaint_id); g_source_remove (range->layout->repaint_id);
range->layout->repaint_id = 0; range->layout->repaint_id = 0;
gtk_widget_get_allocation (widget, &allocation);
expose_area = event->area; expose_area = event->area;
expose_area.x -= widget->allocation.x; expose_area.x -= allocation.x;
expose_area.y -= widget->allocation.y; expose_area.y -= allocation.y;
gtk_range_calc_marks (range); gtk_range_calc_marks (range);
gtk_range_calc_layout (range, range->adjustment->value); gtk_range_calc_layout (range, range->adjustment->value);
@ -1855,9 +1873,9 @@ gtk_range_expose (GtkWidget *widget,
if (gdk_rectangle_intersect (&expose_area, &range->range_rect, if (gdk_rectangle_intersect (&expose_area, &range->range_rect,
&area)) &area))
{ {
gint x = (widget->allocation.x + range->range_rect.x + gint x = (allocation.x + range->range_rect.x +
focus_line_width + focus_padding); focus_line_width + focus_padding);
gint y = (widget->allocation.y + range->range_rect.y + gint y = (allocation.y + range->range_rect.y +
focus_line_width + focus_padding); focus_line_width + focus_padding);
gint width = (range->range_rect.width - gint width = (range->range_rect.width -
2 * (focus_line_width + focus_padding)); 2 * (focus_line_width + focus_padding));
@ -1868,8 +1886,8 @@ gtk_range_expose (GtkWidget *widget,
gint stepper_size; gint stepper_size;
gint stepper_spacing; gint stepper_spacing;
area.x += widget->allocation.x; area.x += allocation.x;
area.y += widget->allocation.y; area.y += allocation.y;
gtk_widget_style_get (GTK_WIDGET (range), gtk_widget_style_get (GTK_WIDGET (range),
"trough-side-details", &trough_side_details, "trough-side-details", &trough_side_details,
@ -1925,8 +1943,7 @@ gtk_range_expose (GtkWidget *widget,
if (! trough_side_details) if (! trough_side_details)
{ {
gtk_paint_box (widget->style, gtk_paint_box (style, window,
widget->window,
sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
GTK_SHADOW_IN, GTK_SHADOW_IN,
&area, GTK_WIDGET(range), "trough", &area, GTK_WIDGET(range), "trough",
@ -1941,14 +1958,13 @@ gtk_range_expose (GtkWidget *widget,
if (range->orientation == GTK_ORIENTATION_HORIZONTAL) if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
trough_change_pos_x = (range->layout->slider.x + trough_change_pos_x = (range->layout->slider.x +
range->layout->slider.width / 2 - range->layout->slider.width / 2 -
(x - widget->allocation.x)); (x - allocation.x));
else else
trough_change_pos_y = (range->layout->slider.y + trough_change_pos_y = (range->layout->slider.y +
range->layout->slider.height / 2 - range->layout->slider.height / 2 -
(y - widget->allocation.y)); (y - allocation.y));
gtk_paint_box (widget->style, gtk_paint_box (style, window,
widget->window,
sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
GTK_SHADOW_IN, GTK_SHADOW_IN,
&area, GTK_WIDGET (range), &area, GTK_WIDGET (range),
@ -1961,8 +1977,7 @@ gtk_range_expose (GtkWidget *widget,
else else
trough_change_pos_x = 0; trough_change_pos_x = 0;
gtk_paint_box (widget->style, gtk_paint_box (style, window,
widget->window,
sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
GTK_SHADOW_IN, GTK_SHADOW_IN,
&area, GTK_WIDGET (range), &area, GTK_WIDGET (range),
@ -1989,7 +2004,7 @@ gtk_range_expose (GtkWidget *widget,
if (range->orientation == GTK_ORIENTATION_HORIZONTAL) if (range->orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
fill_x = widget->allocation.x + range->layout->trough.x; fill_x = allocation.x + range->layout->trough.x;
fill_width = (range->layout->slider.width + fill_width = (range->layout->slider.width +
(fill_level - range->adjustment->lower) / (fill_level - range->adjustment->lower) /
(range->adjustment->upper - (range->adjustment->upper -
@ -2003,7 +2018,7 @@ gtk_range_expose (GtkWidget *widget,
} }
else else
{ {
fill_y = widget->allocation.y + range->layout->trough.y; fill_y = allocation.y + range->layout->trough.y;
fill_height = (range->layout->slider.height + fill_height = (range->layout->slider.height +
(fill_level - range->adjustment->lower) / (fill_level - range->adjustment->lower) /
(range->adjustment->upper - (range->adjustment->upper -
@ -2021,8 +2036,7 @@ gtk_range_expose (GtkWidget *widget,
else else
fill_detail = "trough-fill-level"; fill_detail = "trough-fill-level";
gtk_paint_box (widget->style, gtk_paint_box (style, window,
widget->window,
sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, sensitive ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE,
GTK_SHADOW_OUT, GTK_SHADOW_OUT,
&area, GTK_WIDGET (range), fill_detail, &area, GTK_WIDGET (range), fill_detail,
@ -2031,10 +2045,11 @@ gtk_range_expose (GtkWidget *widget,
} }
if (sensitive && gtk_widget_has_focus (widget)) if (sensitive && gtk_widget_has_focus (widget))
gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget), gtk_paint_focus (style, window,
gtk_widget_get_state (widget),
&area, widget, "trough", &area, widget, "trough",
widget->allocation.x + range->range_rect.x, allocation.x + range->range_rect.x,
widget->allocation.y + range->range_rect.y, allocation.y + range->range_rect.y,
range->range_rect.width, range->range_rect.width,
range->range_rect.height); range->range_rect.height);
} }
@ -2065,18 +2080,18 @@ gtk_range_expose (GtkWidget *widget,
&range->layout->slider, &range->layout->slider,
&area)) &area))
{ {
area.x += widget->allocation.x; area.x += allocation.x;
area.y += widget->allocation.y; area.y += allocation.y;
gtk_paint_slider (widget->style, gtk_paint_slider (style,
widget->window, window,
state, state,
shadow_type, shadow_type,
&area, &area,
widget, widget,
gtk_range_get_slider_detail (range), gtk_range_get_slider_detail (range),
widget->allocation.x + range->layout->slider.x, allocation.x + range->layout->slider.x,
widget->allocation.y + range->layout->slider.y, allocation.y + range->layout->slider.y,
range->layout->slider.width, range->layout->slider.width,
range->layout->slider.height, range->layout->slider.height,
range->orientation); range->orientation);
@ -2349,15 +2364,17 @@ gtk_range_button_press (GtkWidget *widget,
range->layout->mouse_location == MOUSE_STEPPER_D) && range->layout->mouse_location == MOUSE_STEPPER_D) &&
(event->button == 1 || event->button == 2 || event->button == 3)) (event->button == 1 || event->button == 2 || event->button == 3))
{ {
GtkAllocation allocation;
GdkRectangle *stepper_area; GdkRectangle *stepper_area;
GtkScrollType scroll; GtkScrollType scroll;
range_grab_add (range, device, range->layout->mouse_location, event->button); range_grab_add (range, device, range->layout->mouse_location, event->button);
stepper_area = get_area (range, range->layout->mouse_location); stepper_area = get_area (range, range->layout->mouse_location);
gtk_widget_get_allocation (widget, &allocation);
gtk_widget_queue_draw_area (widget, gtk_widget_queue_draw_area (widget,
widget->allocation.x + stepper_area->x, allocation.x + stepper_area->x,
widget->allocation.y + stepper_area->y, allocation.y + stepper_area->y,
stepper_area->width, stepper_area->width,
stepper_area->height); stepper_area->height);
@ -2739,10 +2756,11 @@ static gboolean
force_repaint (gpointer data) force_repaint (gpointer data)
{ {
GtkRange *range = GTK_RANGE (data); GtkRange *range = GTK_RANGE (data);
GtkWidget *widget = GTK_WIDGET (range);
range->layout->repaint_id = 0; range->layout->repaint_id = 0;
if (gtk_widget_is_drawable (GTK_WIDGET (range))) if (gtk_widget_is_drawable (widget))
gdk_window_process_updates (GTK_WIDGET (range)->window, FALSE); gdk_window_process_updates (gtk_widget_get_window (widget), FALSE);
return FALSE; return FALSE;
} }
@ -3110,6 +3128,7 @@ gtk_range_get_props (GtkRange *range,
static gboolean static gboolean
gtk_range_update_mouse_location (GtkRange *range) gtk_range_update_mouse_location (GtkRange *range)
{ {
GtkAllocation allocation;
gint x, y; gint x, y;
MouseLocation old; MouseLocation old;
GtkWidget *widget; GtkWidget *widget;
@ -3121,6 +3140,8 @@ gtk_range_update_mouse_location (GtkRange *range)
x = range->layout->mouse_x; x = range->layout->mouse_x;
y = range->layout->mouse_y; y = range->layout->mouse_y;
gtk_widget_get_allocation (widget, &allocation);
if (range->layout->grab_location != MOUSE_OUTSIDE) if (range->layout->grab_location != MOUSE_OUTSIDE)
range->layout->mouse_location = range->layout->grab_location; range->layout->mouse_location = range->layout->grab_location;
else if (POINT_IN_RECT (x, y, range->layout->stepper_a)) else if (POINT_IN_RECT (x, y, range->layout->stepper_a))
@ -3135,7 +3156,7 @@ gtk_range_update_mouse_location (GtkRange *range)
range->layout->mouse_location = MOUSE_SLIDER; range->layout->mouse_location = MOUSE_SLIDER;
else if (POINT_IN_RECT (x, y, range->layout->trough)) else if (POINT_IN_RECT (x, y, range->layout->trough))
range->layout->mouse_location = MOUSE_TROUGH; range->layout->mouse_location = MOUSE_TROUGH;
else if (POINT_IN_RECT (x, y, widget->allocation)) else if (POINT_IN_RECT (x, y, allocation))
range->layout->mouse_location = MOUSE_WIDGET; range->layout->mouse_location = MOUSE_WIDGET;
else else
range->layout->mouse_location = MOUSE_OUTSIDE; range->layout->mouse_location = MOUSE_OUTSIDE;
@ -3153,6 +3174,7 @@ clamp_dimensions (GtkWidget *widget,
GtkBorder *border, GtkBorder *border,
gboolean border_expands_horizontally) gboolean border_expands_horizontally)
{ {
GtkAllocation allocation;
gint extra, shortage; gint extra, shortage;
g_return_if_fail (rect->x == 0); g_return_if_fail (rect->x == 0);
@ -3160,9 +3182,11 @@ clamp_dimensions (GtkWidget *widget,
g_return_if_fail (rect->width >= 0); g_return_if_fail (rect->width >= 0);
g_return_if_fail (rect->height >= 0); g_return_if_fail (rect->height >= 0);
gtk_widget_get_allocation (widget, &allocation);
/* Width */ /* Width */
extra = widget->allocation.width - border->left - border->right - rect->width; extra = allocation.width - border->left - border->right - rect->width;
if (extra > 0) if (extra > 0)
{ {
if (border_expands_horizontally) if (border_expands_horizontally)
@ -3177,10 +3201,10 @@ clamp_dimensions (GtkWidget *widget,
} }
/* See if we can fit rect, if not kill the border */ /* See if we can fit rect, if not kill the border */
shortage = rect->width - widget->allocation.width; shortage = rect->width - allocation.width;
if (shortage > 0) if (shortage > 0)
{ {
rect->width = widget->allocation.width; rect->width = allocation.width;
/* lose the border */ /* lose the border */
border->left = 0; border->left = 0;
border->right = 0; border->right = 0;
@ -3188,8 +3212,7 @@ clamp_dimensions (GtkWidget *widget,
else else
{ {
/* See if we can fit rect with borders */ /* See if we can fit rect with borders */
shortage = rect->width + border->left + border->right - shortage = rect->width + border->left + border->right - allocation.width;
widget->allocation.width;
if (shortage > 0) if (shortage > 0)
{ {
/* Shrink borders */ /* Shrink borders */
@ -3200,7 +3223,7 @@ clamp_dimensions (GtkWidget *widget,
/* Height */ /* Height */
extra = widget->allocation.height - border->top - border->bottom - rect->height; extra = allocation.height - border->top - border->bottom - rect->height;
if (extra > 0) if (extra > 0)
{ {
if (border_expands_horizontally) if (border_expands_horizontally)
@ -3216,10 +3239,10 @@ clamp_dimensions (GtkWidget *widget,
} }
/* See if we can fit rect, if not kill the border */ /* See if we can fit rect, if not kill the border */
shortage = rect->height - widget->allocation.height; shortage = rect->height - allocation.height;
if (shortage > 0) if (shortage > 0)
{ {
rect->height = widget->allocation.height; rect->height = allocation.height;
/* lose the border */ /* lose the border */
border->top = 0; border->top = 0;
border->bottom = 0; border->bottom = 0;
@ -3227,8 +3250,7 @@ clamp_dimensions (GtkWidget *widget,
else else
{ {
/* See if we can fit rect with borders */ /* See if we can fit rect with borders */
shortage = rect->height + border->top + border->bottom - shortage = rect->height + border->top + border->bottom - allocation.height;
widget->allocation.height;
if (shortage > 0) if (shortage > 0)
{ {
/* Shrink borders */ /* Shrink borders */