[metacity] theme: rename META_STYLE_ELEMENT_FRAME to *_DECORATION



commit 913eaa91d26ccfd9220e0dd0ba5e3985ea0a49e2
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Jan 16 16:33:31 2016 +0200

    theme: rename META_STYLE_ELEMENT_FRAME to *_DECORATION

 src/ui/theme-viewer.c |    4 ++--
 src/ui/theme.c        |   12 ++++++------
 src/ui/theme.h        |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index caca5be..1c1f023 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -927,7 +927,7 @@ main (int argc, char **argv)
   gtk_widget_realize (window);
 
   style_info = meta_theme_create_style_info (gtk_widget_get_screen (window), NULL);
-  gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_FRAME],
+  gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_DECORATION],
                          GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL);
   meta_style_info_unref (style_info);
 
@@ -1006,7 +1006,7 @@ get_text_height (GtkWidget     *widget,
   PangoFontDescription *font_desc;
   int                   text_height;
 
-  gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_FRAME],
+  gtk_style_context_get (style_info->styles[META_STYLE_ELEMENT_DECORATION],
                          GTK_STATE_FLAG_NORMAL, "font", &font_desc, NULL);
   text_height = meta_pango_font_desc_get_text_height (font_desc, gtk_widget_get_pango_context (widget));
   pango_font_description_free (font_desc);
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 769564b..199cf3f 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -705,7 +705,7 @@ meta_frame_layout_sync_with_style (MetaFrameLayout *layout,
 
   layout->button_sizing = META_BUTTON_SIZING_FIXED;
 
-  style = style_info->styles[META_STYLE_ELEMENT_FRAME];
+  style = style_info->styles[META_STYLE_ELEMENT_DECORATION];
   get_padding_and_border (style, &border);
   scale_border (&border, layout->title_scale);
 
@@ -5030,7 +5030,7 @@ meta_frame_style_draw_with_style (MetaFrameStyle          *style,
               MetaRectangle m_rect;
               m_rect = meta_rect (rect.x, rect.y, rect.width, rect.height);
               meta_draw_op_list_draw_with_style (op_list,
-                                                 style_info->styles[META_STYLE_ELEMENT_FRAME],
+                                                 style_info->styles[META_STYLE_ELEMENT_DECORATION],
                                                  cr,
                                                  &draw_info,
                                                  m_rect);
@@ -5068,7 +5068,7 @@ meta_frame_style_draw_with_style (MetaFrameStyle          *style,
                       m_rect = meta_rect (rect.x, rect.y,
                                           rect.width, rect.height);
                       meta_draw_op_list_draw_with_style (op_list,
-                                                         style_info->styles[META_STYLE_ELEMENT_FRAME],
+                                                         style_info->styles[META_STYLE_ELEMENT_DECORATION],
                                                          cr,
                                                          &draw_info,
                                                          m_rect);
@@ -5136,7 +5136,7 @@ meta_frame_style_draw_with_style_gtk (MetaFrameStyle          *frame_style,
 
   meta_style_info_set_flags (style_info, flags);
 
-  style = style_info->styles[META_STYLE_ELEMENT_FRAME];
+  style = style_info->styles[META_STYLE_ELEMENT_DECORATION];
   gtk_render_background (style, cr,
                          visible_rect.x, visible_rect.y,
                          visible_rect.width, visible_rect.height);
@@ -6047,7 +6047,7 @@ meta_theme_create_style_info (GdkScreen   *screen,
 
   compositing_manager = meta_prefs_get_compositing_manager ();
 
-  style_info->styles[META_STYLE_ELEMENT_FRAME] =
+  style_info->styles[META_STYLE_ELEMENT_DECORATION] =
     create_style_context (G_TYPE_NONE,
                           NULL,
                           provider,
@@ -6058,7 +6058,7 @@ meta_theme_create_style_info (GdkScreen   *screen,
                           NULL);
   style_info->styles[META_STYLE_ELEMENT_TITLEBAR] =
     create_style_context (G_TYPE_NONE,
-                          style_info->styles[META_STYLE_ELEMENT_FRAME],
+                          style_info->styles[META_STYLE_ELEMENT_DECORATION],
                           provider,
                           "headerbar",
                           GTK_STYLE_CLASS_TITLEBAR,
diff --git a/src/ui/theme.h b/src/ui/theme.h
index ae74657..a1de2bb 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -645,7 +645,7 @@ typedef enum
 
 typedef enum
 {
-  META_STYLE_ELEMENT_FRAME,
+  META_STYLE_ELEMENT_DECORATION,
   META_STYLE_ELEMENT_TITLEBAR,
   META_STYLE_ELEMENT_TITLE,
   META_STYLE_ELEMENT_BUTTON,


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