applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gvc-level-bar: Replace size_request by get_preferred_width/height

Browse source 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=635117
This commit is contained in:
Javier Jardón 2010-11-17 22:22:01 +01:00 • committed by Bastien Nocera
parent 9b1176aefc
commit 9aa37efb15
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
panels/sound/gvc-level-bar.c
View file

@ -438,12 +438,7 @@ static void
gvc_level_bar_size_request (GtkWidget *widget, gvc_level_bar_size_request (GtkWidget *widget,
GtkRequisition *requisition) GtkRequisition *requisition)
{ {
GvcLevelBar *bar; GvcLevelBar *bar = GVC_LEVEL_BAR (widget);
g_return_if_fail (GVC_IS_LEVEL_BAR (widget));
g_return_if_fail (requisition != NULL);
bar = GVC_LEVEL_BAR (widget);
switch (bar->priv->orientation) { switch (bar->priv->orientation) {
case GTK_ORIENTATION_VERTICAL: case GTK_ORIENTATION_VERTICAL:
@ -460,6 +455,30 @@ gvc_level_bar_size_request (GtkWidget *widget,
} }
} }
static void
gvc_level_bar_get_preferred_width (GtkWidget *widget,
gint *minimum,
gint *natural)
{
GtkRequisition requisition;
gvc_level_bar_size_request (widget, &requisition);
*minimum = *natural = requisition.width;
}
static void
gvc_level_bar_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural)
{
GtkRequisition requisition;
gvc_level_bar_size_request (widget, &requisition);
*minimum = *natural = requisition.height;
}
static void static void
gvc_level_bar_size_allocate (GtkWidget *widget, gvc_level_bar_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
@ -648,7 +667,8 @@ gvc_level_bar_class_init (GvcLevelBarClass *klass)
object_class->get_property = gvc_level_bar_get_property; object_class->get_property = gvc_level_bar_get_property;
widget_class->draw = gvc_level_bar_draw; widget_class->draw = gvc_level_bar_draw;
widget_class->size_request = gvc_level_bar_size_request; widget_class->get_preferred_width = gvc_level_bar_get_preferred_width;
widget_class->get_preferred_height = gvc_level_bar_get_preferred_height;
widget_class->size_allocate = gvc_level_bar_size_allocate; widget_class->size_allocate = gvc_level_bar_size_allocate;
g_object_class_install_property (object_class, g_object_class_install_property (object_class,