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

separator: don't read wide-separators style property

Browse Source 
The notion of a separator being wide or not does not make sense when a
theme can set any CSS property on it, and
separator-width/separator-height are on their way out for
min-width/min-height.
This commit is contained in:
Cosimo Cecchi
2015-12-29 17:44:01 -08:00
parent 0740f23c77
commit 1f690ddbfa
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
gtk/gtkseparator.c
View File

@ -114,37 +114,6 @@ gtk_separator_get_property (GObject *object,
} }
} }
static void
gtk_separator_measure (GtkCssGadget *gadget,
GtkOrientation orientation,
gint for_size,
gint *minimum,
gint *natural,
gint *minimum_baseline,
gint *natural_baseline,
gpointer data)
{
GtkWidget *widget;
gboolean wide_sep;
gint sep_width;
gint sep_height;
widget = gtk_css_gadget_get_owner (gadget);
gtk_widget_style_get (widget,
"wide-separators", &wide_sep,
"separator-width", &sep_width,
"separator-height", &sep_height,
NULL);
if (orientation == GTK_SEPARATOR (widget)->priv->orientation)
*minimum = *natural = 1;
else if (orientation == GTK_ORIENTATION_VERTICAL)
*minimum = *natural = wide_sep ? sep_height : 1;
else
*minimum = *natural = wide_sep ? sep_width : 1;
}
static void static void
gtk_separator_get_preferred_width (GtkWidget *widget, gtk_separator_get_preferred_width (GtkWidget *widget,
gint *minimum, gint *minimum,
@ -209,11 +178,8 @@ gtk_separator_init (GtkSeparator *separator)
widget_node = gtk_widget_get_css_node (GTK_WIDGET (separator)); widget_node = gtk_widget_get_css_node (GTK_WIDGET (separator));
separator->priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node, separator->priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node,
GTK_WIDGET (separator), GTK_WIDGET (separator),
gtk_separator_measure, NULL, NULL, NULL,
NULL, NULL, NULL);
NULL,
NULL,
NULL);
} }
static void static void