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

CcPanel: derive from GtkBin, rather than GtkAlignment

Browse source 
CcPanel does not require any features of GtkAlignment, so derive from
GtkBin directly.
This commit is contained in:
Thomas Wood 2010-07-06 14:13:26 +01:00
parent 59920f88a0
commit 3d9ada13f0
2 changed files with 48 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

47
libgnome-control-center/cc-panel.c
View file

@ -60,7 +60,7 @@ enum
PROP_SHELL, PROP_SHELL,
}; };
G_DEFINE_ABSTRACT_TYPE (CcPanel, cc_panel, GTK_TYPE_ALIGNMENT) G_DEFINE_ABSTRACT_TYPE (CcPanel, cc_panel, GTK_TYPE_BIN)
static void static void
cc_panel_set_property (GObject *object, cc_panel_set_property (GObject *object,
@ -123,17 +123,62 @@ cc_panel_finalize (GObject *object)
G_OBJECT_CLASS (cc_panel_parent_class)->finalize (object); G_OBJECT_CLASS (cc_panel_parent_class)->finalize (object);
} }
static void
cc_panel_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin = GTK_BIN (widget);
GtkWidget *child;
guint border_width;
if ((child = gtk_bin_get_child (bin)))
{
GtkRequisition child_requisition;
gtk_widget_size_request (child, &child_requisition);
requisition->width = child_requisition.width;
requisition->height = child_requisition.height;
}
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
requisition->width += 2 * border_width;
requisition->height += 2 * border_width;
}
static void
cc_panel_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkAllocation child_allocation;
guint border_width;
child_allocation = *allocation;
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
child_allocation.width -= 2 * border_width;
child_allocation.height -= 2 * border_width;
gtk_widget_size_allocate (gtk_bin_get_child (GTK_BIN (widget)),
&child_allocation);
}
static void static void
cc_panel_class_init (CcPanelClass *klass) cc_panel_class_init (CcPanelClass *klass)
{ {
GParamSpec *pspec; GParamSpec *pspec;
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->get_property = cc_panel_get_property; object_class->get_property = cc_panel_get_property;
object_class->set_property = cc_panel_set_property; object_class->set_property = cc_panel_set_property;
object_class->finalize = cc_panel_finalize; object_class->finalize = cc_panel_finalize;
widget_class->size_request = cc_panel_size_request;
widget_class->size_allocate = cc_panel_size_allocate;
g_type_class_add_private (klass, sizeof (CcPanelPrivate)); g_type_class_add_private (klass, sizeof (CcPanelPrivate));
pspec = g_param_spec_object ("shell", pspec = g_param_spec_object ("shell",

4
libgnome-control-center/cc-panel.h
View file

@ -54,7 +54,7 @@ typedef struct _CcPanelClass CcPanelClass;
struct _CcPanel struct _CcPanel
{ {
/*< private >*/ /*< private >*/
GtkAlignment parent; GtkBin parent;
CcPanelPrivate *priv; CcPanelPrivate *priv;
}; };
/** /**
@ -65,7 +65,7 @@ struct _CcPanel
struct _CcPanelClass struct _CcPanelClass
{ {
/*< private >*/ /*< private >*/
GtkAlignmentClass parent_class; GtkBinClass parent_class;
}; };
GType cc_panel_get_type (void); GType cc_panel_get_type (void);