AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

statusbar: Deprecate style properties

Browse Source 
We were not really using the shadow-type style property anyway,
so lets just deprecate it. Themes can directly theme the frame.
This commit is contained in:
Matthias Clasen 2015-12-19 23:53:31 -05:00
parent 57dd855d10
commit f792d20507
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkstatusbar.c
View File

@ -165,13 +165,21 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
G_TYPE_UINT, G_TYPE_UINT,
G_TYPE_STRING); G_TYPE_STRING);
/**
* GtkStatusbar:shadow-type:
*
* The style of the bevel around the statusbar text.
*
* Deprecated: 3.20: Use CSS properties to determine the appearance,
* 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_enum ("shadow-type", g_param_spec_enum ("shadow-type",
P_("Shadow type"), P_("Shadow type"),
P_("Style of bevel around the statusbar text"), P_("Style of bevel around the statusbar text"),
GTK_TYPE_SHADOW_TYPE, GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_IN, GTK_SHADOW_IN,
GTK_PARAM_READABLE)); GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
/* Bind class to template /* Bind class to template
*/ */
@ -188,7 +196,6 @@ static void
gtk_statusbar_init (GtkStatusbar *statusbar) gtk_statusbar_init (GtkStatusbar *statusbar)
{ {
GtkStatusbarPrivate *priv; GtkStatusbarPrivate *priv;
GtkShadowType shadow_type;
statusbar->priv = gtk_statusbar_get_instance_private (statusbar); statusbar->priv = gtk_statusbar_get_instance_private (statusbar);
priv = statusbar->priv; priv = statusbar->priv;
@ -199,10 +206,7 @@ gtk_statusbar_init (GtkStatusbar *statusbar)
priv->keys = NULL; priv->keys = NULL;
gtk_widget_init_template (GTK_WIDGET (statusbar)); gtk_widget_init_template (GTK_WIDGET (statusbar));
gtk_widget_set_redraw_on_allocate (GTK_WIDGET (statusbar), TRUE); gtk_widget_set_redraw_on_allocate (GTK_WIDGET (statusbar), TRUE);
gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL);
gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), shadow_type);
} }
/** /**

2
gtk/theme/Adwaita/_common.scss
View File

@ -31,8 +31,6 @@ $asset_suffix: if($variant=='dark', '-dark', '');
-GtkDialog-button-spacing: 4; -GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0; -GtkDialog-action-area-border: 0;
-GtkStatusbar-shadow-type: none;
// We use the outline properties to signal the focus properties // We use the outline properties to signal the focus properties
// to the adwaita engine: using real CSS properties is faster, // to the adwaita engine: using real CSS properties is faster,
// and we don't use any outlines for now. // and we don't use any outlines for now.

1
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -12,7 +12,6 @@
-GtkWidget-text-handle-height: 24; -GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4; -GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0; -GtkDialog-action-area-border: 0;
-GtkStatusbar-shadow-type: none;
outline-color: rgba(238, 238, 236, 0.3); outline-color: rgba(238, 238, 236, 0.3);
outline-style: dashed; outline-style: dashed;
outline-offset: -3px; outline-offset: -3px;

1
gtk/theme/Adwaita/gtk-contained.css
View File

@ -12,7 +12,6 @@
-GtkWidget-text-handle-height: 24; -GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4; -GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0; -GtkDialog-action-area-border: 0;
-GtkStatusbar-shadow-type: none;
outline-color: rgba(46, 52, 54, 0.3); outline-color: rgba(46, 52, 54, 0.3);
outline-style: dashed; outline-style: dashed;
outline-offset: -3px; outline-offset: -3px;