AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 14:00:10 +00:00
Code Issues Projects Releases Wiki Activity

scale: Use more succinct names for style classes

Browse Source 
Use .marks-before/after to indicate the presence of marks.
As Lapo points out, compatibility with the previous names
is not really that important, since everything else changed
around it.

https://bugzilla.gnome.org/show_bug.cgi?id=766440
This commit is contained in:
Matthias Clasen 2016-05-19 09:44:25 -04:00
parent de7c15636d
commit 4151cb1202
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkscale.c
View File

@ -76,7 +76,7 @@
* # CSS nodes * # CSS nodes
* *
* |[<!-- language="plain" --> * |[<!-- language="plain" -->
* scale[.fine-tune][.scale-has-marks-above][.scale-has-marks-below] * scale[.fine-tune][.marks-before][.marks-after]
* ├── marks.top * ├── marks.top
* │ ├── mark * │ ├── mark
* │ ┊ ├── [label] * │ ┊ ├── [label]
@ -119,8 +119,8 @@
* scale, the label subnode is the first when present. Otherwise, the indicator * scale, the label subnode is the first when present. Otherwise, the indicator
* subnode is the first. * subnode is the first.
* *
* The main CSS node gets the 'scale-has-marks-above' and/or 'scale-has-marks-below' * The main CSS node gets the 'marks-before' and/or 'marks-after' style classes
* style classes added depending on what marks are present. * added depending on what marks are present.
* *
* If the scale is displaying the value (see #GtkScale:draw-value), there is * If the scale is displaying the value (see #GtkScale:draw-value), there is
* subnode with name value. * subnode with name value.
@ -2027,8 +2027,8 @@ gtk_scale_clear_marks (GtkScale *scale)
g_clear_object (&priv->bottom_marks_gadget); g_clear_object (&priv->bottom_marks_gadget);
context = gtk_widget_get_style_context (GTK_WIDGET (scale)); context = gtk_widget_get_style_context (GTK_WIDGET (scale));
gtk_style_context_remove_class (context, GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW); gtk_style_context_remove_class (context, "marks-before");
gtk_style_context_remove_class (context, GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE); gtk_style_context_remove_class (context, "marks-after");
_gtk_range_set_stop_values (GTK_RANGE (scale), NULL, 0); _gtk_range_set_stop_values (GTK_RANGE (scale), NULL, 0);
@ -2199,9 +2199,9 @@ gtk_scale_add_mark (GtkScale *scale,
context = gtk_widget_get_style_context (GTK_WIDGET (scale)); context = gtk_widget_get_style_context (GTK_WIDGET (scale));
if (priv->top_marks_gadget) if (priv->top_marks_gadget)
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCALE_HAS_MARKS_ABOVE); gtk_style_context_add_class (context, "marks-before");
if (priv->bottom_marks_gadget) if (priv->bottom_marks_gadget)
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SCALE_HAS_MARKS_BELOW); gtk_style_context_add_class (context, "marks-after");
gtk_widget_queue_resize (widget); gtk_widget_queue_resize (widget);
} }