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

progressbar: Ignore x/yspacing style properties

Browse Source 
These are not really useful, so ignore and deprecate them.
This commit is contained in:
Matthias Clasen
2015-11-16 06:16:31 -05:00
parent bab98a8427
commit c6d5accf9c
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkprogressbar.c
View File

@ -257,6 +257,14 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
g_object_class_install_properties (gobject_class, NUM_PROPERTIES, progress_props); g_object_class_install_properties (gobject_class, NUM_PROPERTIES, progress_props);
/**
* GtkProgressBar:xspacing:
*
* Extra spacing applied to the width of a progress bar.
*
* Deprecated: 3.20: Use the standard CSS padding and margins; the
* value of this style property is ignored.
*/
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("xspacing", g_param_spec_int ("xspacing",
P_("X spacing"), P_("X spacing"),
@ -264,6 +272,14 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
0, G_MAXINT, 2, 0, G_MAXINT, 2,
G_PARAM_READWRITE)); G_PARAM_READWRITE));
/**
* GtkProgressBar:yspacing:
*
* Extra spacing applied to the height of a progress bar.
*
* Deprecated: 3.20: Use the standard CSS padding and margins; the
* value of this style property is ignored.
*/
gtk_widget_class_install_style_property (widget_class, gtk_widget_class_install_style_property (widget_class,
g_param_spec_int ("yspacing", g_param_spec_int ("yspacing",
P_("Y spacing"), P_("Y spacing"),
@ -606,7 +622,6 @@ gtk_progress_bar_get_preferred_width (GtkWidget *widget,
PangoRectangle logical_rect; PangoRectangle logical_rect;
PangoLayout *layout; PangoLayout *layout;
gint width; gint width;
gint xspacing;
gint bar_width; gint bar_width;
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget)); g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
@ -621,11 +636,6 @@ gtk_progress_bar_get_preferred_width (GtkWidget *widget,
if (priv->show_text) if (priv->show_text)
{ {
gtk_widget_style_get (widget,
"xspacing", &xspacing,
NULL);
width += xspacing;
buf = get_current_text (pbar); buf = get_current_text (pbar);
layout = gtk_widget_create_pango_layout (widget, buf); layout = gtk_widget_create_pango_layout (widget, buf);
@ -680,7 +690,6 @@ gtk_progress_bar_get_preferred_height (GtkWidget *widget,
PangoRectangle logical_rect; PangoRectangle logical_rect;
PangoLayout *layout; PangoLayout *layout;
gint height; gint height;
gint yspacing;
gint bar_height; gint bar_height;
g_return_if_fail (GTK_IS_PROGRESS_BAR (widget)); g_return_if_fail (GTK_IS_PROGRESS_BAR (widget));
@ -695,11 +704,6 @@ gtk_progress_bar_get_preferred_height (GtkWidget *widget,
if (priv->show_text) if (priv->show_text)
{ {
gtk_widget_style_get (widget,
"yspacing", &yspacing,
NULL);
height += yspacing;
buf = get_current_text (pbar); buf = get_current_text (pbar);
layout = gtk_widget_create_pango_layout (widget, buf); layout = gtk_widget_create_pango_layout (widget, buf);