[gtk/wip/otte/css: 307/307] css: Rename GTK_CSS_CHANGE_SOURCE to GTK_CSS_CHANGE_STYLE_SHEET



commit 07392c4d960c4d721b5df1c1e51eee53a706458b
Author: Benjamin Otte <otte redhat com>
Date:   Tue Feb 11 01:21:31 2020 +0100

    css: Rename GTK_CSS_CHANGE_SOURCE to GTK_CSS_CHANGE_STYLE_SHEET
    
    Because that's what it's for after the introduction of
    GTK_CSS_CHANGE_ROOT: Tracking changes to the style sheet(s).

 gtk/gtkcssnode.c         | 4 ++--
 gtk/gtkcsstypes.c        | 6 +++---
 gtk/gtkcsstypesprivate.h | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkcssnode.c b/gtk/gtkcssnode.c
index 7ba92ffc25..192b3c3b0d 100644
--- a/gtk/gtkcssnode.c
+++ b/gtk/gtkcssnode.c
@@ -89,7 +89,7 @@
  * if we need to change things. */
 #define GTK_CSS_RADICAL_CHANGE (GTK_CSS_CHANGE_ID | GTK_CSS_CHANGE_NAME | GTK_CSS_CHANGE_CLASS | \
                                 GTK_CSS_CHANGE_PARENT_ID | GTK_CSS_CHANGE_PARENT_NAME | 
GTK_CSS_CHANGE_PARENT_CLASS | \
-                                GTK_CSS_CHANGE_SOURCE | GTK_CSS_CHANGE_ROOT | GTK_CSS_CHANGE_PARENT_STYLE)
+                                GTK_CSS_CHANGE_STYLE_SHEET | GTK_CSS_CHANGE_ROOT | 
GTK_CSS_CHANGE_PARENT_STYLE)
 
 /* When these change, we need to recompute the change flags for the new style
  * since they may have changed.
@@ -1243,7 +1243,7 @@ gtk_css_node_invalidate_style_provider (GtkCssNode *cssnode)
 {
   GtkCssNode *child;
 
-  gtk_css_node_invalidate (cssnode, GTK_CSS_CHANGE_SOURCE);
+  gtk_css_node_invalidate (cssnode, GTK_CSS_CHANGE_STYLE_SHEET);
 
   for (child = cssnode->first_child;
        child;
diff --git a/gtk/gtkcsstypes.c b/gtk/gtkcsstypes.c
index b43ed074d3..b8aff81386 100644
--- a/gtk/gtkcsstypes.c
+++ b/gtk/gtkcsstypes.c
@@ -38,7 +38,7 @@ _gtk_css_change_for_sibling (GtkCssChange match)
                     | GTK_CSS_CHANGE_SELECTED \
                     | GTK_CSS_CHANGE_BACKDROP)
 
-#define KEEP_STATES ( ~(BASE_STATES|GTK_CSS_CHANGE_SOURCE|GTK_CSS_CHANGE_ROOT|GTK_CSS_CHANGE_PARENT_STYLE) \
+#define KEEP_STATES ( 
~(BASE_STATES|GTK_CSS_CHANGE_STYLE_SHEET|GTK_CSS_CHANGE_ROOT|GTK_CSS_CHANGE_PARENT_STYLE) \
                     | GTK_CSS_CHANGE_NTH_CHILD \
                     | GTK_CSS_CHANGE_NTH_LAST_CHILD)
 
@@ -76,7 +76,7 @@ _gtk_css_change_for_child (GtkCssChange match)
                     | GTK_CSS_CHANGE_SIBLING_BACKDROP \
                     | GTK_CSS_CHANGE_SIBLING_SELECTED)
 
-#define KEEP_STATES (~(BASE_STATES|GTK_CSS_CHANGE_SOURCE|GTK_CSS_CHANGE_ROOT|GTK_CSS_CHANGE_PARENT_STYLE))
+#define KEEP_STATES 
(~(BASE_STATES|GTK_CSS_CHANGE_STYLE_SHEET|GTK_CSS_CHANGE_ROOT|GTK_CSS_CHANGE_PARENT_STYLE))
 
   return (match & KEEP_STATES) | ((match & BASE_STATES) << GTK_CSS_CHANGE_PARENT_SHIFT);
 
@@ -144,7 +144,7 @@ gtk_css_change_print (GtkCssChange  change,
     { GTK_CSS_CHANGE_PARENT_SIBLING_BACKDROP, "parent-sibling-backdrop" },
     { GTK_CSS_CHANGE_PARENT_SIBLING_SELECTED, "parent-sibling-selected" },
 
-    { GTK_CSS_CHANGE_SOURCE, "source" },
+    { GTK_CSS_CHANGE_STYLE_SHEET, "style-sheet" },
     { GTK_CSS_CHANGE_ROOT, "root" },
     { GTK_CSS_CHANGE_PARENT_STYLE, "parent-style" },
     { GTK_CSS_CHANGE_TIMESTAMP, "timestamp" },
diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 1d6b3f4a30..d722b23eaf 100644
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -89,7 +89,7 @@ typedef struct _GtkCssStaticStyle GtkCssStaticStyle;
 #define GTK_CSS_CHANGE_PARENT_SIBLING_SELECTED        (1ULL << 47)
 
 /* add more */
-#define GTK_CSS_CHANGE_SOURCE                         (1ULL << 48)
+#define GTK_CSS_CHANGE_STYLE_SHEET                    (1ULL << 48)
 #define GTK_CSS_CHANGE_ROOT                           (1ULL << 49)
 #define GTK_CSS_CHANGE_PARENT_STYLE                   (1ULL << 50)
 #define GTK_CSS_CHANGE_TIMESTAMP                      (1ULL << 51)
@@ -122,7 +122,7 @@ typedef guint64 GtkCssChange;
                             GTK_CSS_CHANGE_ANY_SIBLING        | \
                             GTK_CSS_CHANGE_ANY_PARENT         | \
                             GTK_CSS_CHANGE_ANY_PARENT_SIBLING | \
-                            GTK_CSS_CHANGE_SOURCE             | \
+                            GTK_CSS_CHANGE_STYLE_SHEET        | \
                             GTK_CSS_CHANGE_ROOT               | \
                             GTK_CSS_CHANGE_PARENT_STYLE       | \
                             GTK_CSS_CHANGE_TIMESTAMP          | \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]