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

Remove size_request from GtkRange

Browse Source
This commit is contained in:
Matthias Clasen 2010-10-27 08:10:40 -04:00
parent 9b60d27b83
commit d95f8ae2e2
1 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkrange.c
View File

@ -182,8 +182,14 @@ static void gtk_range_get_property (GObject *object,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_range_destroy (GtkWidget *widget); static void gtk_range_destroy (GtkWidget *widget);
static void gtk_range_size_request (GtkWidget *widget, static void gtk_range_get_preferred_width
GtkRequisition *requisition); (GtkWidget *widget,
gint *minimum,
gint *natural);
static void gtk_range_get_preferred_height
(GtkWidget *widget,
gint *minimum,
gint *natural);
static void gtk_range_size_allocate (GtkWidget *widget, static void gtk_range_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static void gtk_range_hierarchy_changed (GtkWidget *widget, static void gtk_range_hierarchy_changed (GtkWidget *widget,
@ -293,7 +299,8 @@ gtk_range_class_init (GtkRangeClass *class)
gobject_class->get_property = gtk_range_get_property; gobject_class->get_property = gtk_range_get_property;
widget_class->destroy = gtk_range_destroy; widget_class->destroy = gtk_range_destroy;
widget_class->size_request = gtk_range_size_request; widget_class->get_preferred_width = gtk_range_get_preferred_width;
widget_class->get_preferred_height = gtk_range_get_preferred_height;
widget_class->size_allocate = gtk_range_size_allocate; widget_class->size_allocate = gtk_range_size_allocate;
widget_class->hierarchy_changed = gtk_range_hierarchy_changed; widget_class->hierarchy_changed = gtk_range_hierarchy_changed;
widget_class->realize = gtk_range_realize; widget_class->realize = gtk_range_realize;
@ -1550,8 +1557,9 @@ gtk_range_destroy (GtkWidget *widget)
} }
static void static void
gtk_range_size_request (GtkWidget *widget, gtk_range_get_preferred_width (GtkWidget *widget,
GtkRequisition *requisition) gint *minimum,
gint *natural)
{ {
GtkRange *range; GtkRange *range;
gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing; gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing;
@ -1571,8 +1579,33 @@ gtk_range_size_request (GtkWidget *widget,
focus_width, trough_border, stepper_spacing, focus_width, trough_border, stepper_spacing,
&range_rect, &border, NULL, NULL, NULL, NULL); &range_rect, &border, NULL, NULL, NULL, NULL);
requisition->width = range_rect.width + border.left + border.right; *minimum = *natural = range_rect.width + border.left + border.right;
requisition->height = range_rect.height + border.top + border.bottom; }
static void
gtk_range_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
GtkRange *range;
gint slider_width, stepper_size, focus_width, trough_border, stepper_spacing;
GdkRectangle range_rect;
GtkBorder border;
range = GTK_RANGE (widget);
gtk_range_get_props (range,
&slider_width, &stepper_size,
&focus_width, &trough_border,
&stepper_spacing, NULL,
NULL, NULL);
gtk_range_calc_request (range,
slider_width, stepper_size,
focus_width, trough_border, stepper_spacing,
&range_rect, &border, NULL, NULL, NULL, NULL);
*minimum = *natural = range_rect.height + border.top + border.bottom;
} }
static gboolean static gboolean