diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2015-12-29 17:44:01 -0800 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2016-01-03 00:42:51 -0800 |
| commit | 1f690ddbfa62bd3b81a936beda1fd593fe2b0035 (patch) | |
| tree | aed07ec5dc23d0295cf97877fe4258e93580637b /gtk/gtkseparator.c | |
| parent | 0740f23c77c499810c716f61591818371fa4211e (diff) | |
| download | gtk+-1f690ddbfa62bd3b81a936beda1fd593fe2b0035.tar.gz | |
separator: don't read wide-separators style property
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.
Diffstat (limited to 'gtk/gtkseparator.c')
| -rw-r--r-- | gtk/gtkseparator.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c index a308d8a84c..f76fb368e3 100644 --- a/gtk/gtkseparator.c +++ b/gtk/gtkseparator.c @@ -115,37 +115,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 gtk_separator_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural) @@ -209,11 +178,8 @@ gtk_separator_init (GtkSeparator *separator) widget_node = gtk_widget_get_css_node (GTK_WIDGET (separator)); separator->priv->gadget = gtk_css_custom_gadget_new_for_node (widget_node, GTK_WIDGET (separator), - gtk_separator_measure, - NULL, - NULL, - NULL, - NULL); + NULL, NULL, NULL, + NULL, NULL); } static void |