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

menubar: add support for CSS padding

Browse Source 
In preparation for the removal of the internal-padding style property.

https://bugzilla.gnome.org/show_bug.cgi?id=689168
This commit is contained in:
Cosimo Cecchi
2012-11-27 09:14:20 -05:00
parent 01dc23cdec
commit 1a79ee4d3e
1 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
gtk/gtkmenubar.c
View File

@ -336,6 +336,9 @@ gtk_menu_bar_size_request (GtkWidget *widget,
guint border_width;
gboolean use_toggle_size, use_maximize;
gint child_minimum, child_natural;
GtkStyleContext *context;
GtkBorder border;
GtkStateFlags flags;
*minimum = 0;
*natural = 0;
@ -391,6 +394,21 @@ gtk_menu_bar_size_request (GtkWidget *widget,
}
}
context = gtk_widget_get_style_context (widget);
flags = gtk_widget_get_state_flags (widget);
gtk_style_context_get_padding (context, flags, &border);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
*minimum += border.left + border.right;
*natural += border.left + border.right;
}
else
{
*minimum += border.top + border.bottom;
*natural += border.top + border.bottom;
}
gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
*minimum += (border_width + ipadding + BORDER_SPACING) * 2;
@ -398,12 +416,7 @@ gtk_menu_bar_size_request (GtkWidget *widget,
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
GtkStyleContext *context;
GtkBorder border;
context = gtk_widget_get_style_context (widget);
gtk_style_context_get_border (context, gtk_widget_get_state_flags (widget),
&border);
gtk_style_context_get_border (context, flags, &border);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
@ -483,29 +496,36 @@ gtk_menu_bar_size_allocate (GtkWidget *widget,
allocation->width, allocation->height);
if (menu_shell->priv->children)
{
gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
remaining_space.x = (border_width +
ipadding +
BORDER_SPACING);
remaining_space.y = (border_width +
ipadding +
BORDER_SPACING);
remaining_space.width = allocation->width -
2 * (border_width + ipadding + BORDER_SPACING);
remaining_space.height = allocation->height -
2 * (border_width + ipadding + BORDER_SPACING);
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
GtkStyleContext *context;
GtkStateFlags flags;
GtkBorder border;
context = gtk_widget_get_style_context (widget);
gtk_style_context_get_border (context, gtk_widget_get_state_flags (widget),
&border);
flags = gtk_widget_get_state_flags (widget);
gtk_style_context_get_padding (context, flags, &border);
gtk_widget_style_get (widget, "internal-padding", &ipadding, NULL);
border_width = gtk_container_get_border_width (GTK_CONTAINER (menu_bar));
remaining_space.x = (border_width +
ipadding +
BORDER_SPACING +
border.left);
remaining_space.y = (border_width +
ipadding +
BORDER_SPACING +
border.top);
remaining_space.width = allocation->width -
2 * (border_width + ipadding + BORDER_SPACING) -
border.left - border.right;
remaining_space.height = allocation->height -
2 * (border_width + ipadding + BORDER_SPACING) -
border.top - border.bottom;
if (get_shadow_type (menu_bar) != GTK_SHADOW_NONE)
{
gtk_style_context_get_border (context, flags, &border);
remaining_space.x += border.left;
remaining_space.y += border.top;