isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

uiframe: Make children respect border/padding

Browse Source 
Also, center the label horizontally. There's still some shenanigans
I have to figure out with respect to vertical centering...

This should be in GTK+ by default...
This commit is contained in:
Jasper St. Pierre 2012-05-05 02:12:04 -03:00
parent 1620131434
commit 8d8e0cb055
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/ui/uiframe.c
View File

@ -72,6 +72,11 @@ meta_uiframe_init (MetaUIFrame *frame)
gtk_container_add (GTK_CONTAINER (frame), container); gtk_container_add (GTK_CONTAINER (frame), container);
gtk_container_add (GTK_CONTAINER (container), frame->label); gtk_container_add (GTK_CONTAINER (container), frame->label);
gtk_widget_set_hexpand (container, TRUE);
gtk_widget_set_hexpand (label, TRUE);
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
gtk_widget_set_valign (label, GTK_ALIGN_START);
gtk_widget_show_all (GTK_WIDGET (container)); gtk_widget_show_all (GTK_WIDGET (container));
} }
@ -1071,6 +1076,21 @@ meta_uiframe_draw (GtkWidget *widget,
return TRUE; return TRUE;
} }
static void
meta_uiframe_style_updated (GtkWidget *widget)
{
MetaUIFrame *frame = META_UIFRAME (widget);
GtkWidget *container = frame->container;
MetaFrameGeometry fgeom;
meta_uiframe_calc_geometry (frame, &fgeom);
gtk_widget_set_margin_left (container, fgeom.borders.total.left);
gtk_widget_set_margin_right (container, fgeom.borders.total.right);
gtk_widget_set_margin_top (container, fgeom.borders.invisible.top);
gtk_widget_set_size_request (container, -1, fgeom.borders.visible.top);
}
static gboolean static gboolean
meta_uiframe_enter_notify_event (GtkWidget *widget, meta_uiframe_enter_notify_event (GtkWidget *widget,
GdkEventCrossing *event) GdkEventCrossing *event)
@ -1331,6 +1351,7 @@ meta_uiframe_class_init (MetaUIFrameClass *class)
gobject_class->finalize = meta_uiframe_finalize; gobject_class->finalize = meta_uiframe_finalize;
widget_class->draw = meta_uiframe_draw; widget_class->draw = meta_uiframe_draw;
widget_class->style_updated = meta_uiframe_style_updated;
widget_class->button_press_event = meta_uiframe_button_press_event; widget_class->button_press_event = meta_uiframe_button_press_event;
widget_class->button_release_event = meta_uiframe_button_release_event; widget_class->button_release_event = meta_uiframe_button_release_event;
widget_class->motion_notify_event = meta_uiframe_motion_notify_event; widget_class->motion_notify_event = meta_uiframe_motion_notify_event;