[metacity] libmetacity: rename invisible_border to invisible_resize_border

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 662d408f06bf3f4087cf0f5ff2a472523f250235
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Feb 7 16:40:56 2016 +0200

    libmetacity: rename invisible_border to invisible_resize_border

 libmetacity/meta-frame-layout.c   |    8 ++++----
 libmetacity/meta-frame-layout.h   |    4 ++--
 libmetacity/meta-theme-gtk.c      |   27 ++++++++++-----------------
 libmetacity/meta-theme-metacity.c |    8 ++++----
 4 files changed, 20 insertions(+), 27 deletions(-)
---
diff --git a/libmetacity/meta-frame-layout.c b/libmetacity/meta-frame-layout.c
index ce63243..5cf6ae0 100644
--- a/libmetacity/meta-frame-layout.c
+++ b/libmetacity/meta-frame-layout.c
@@ -141,10 +141,10 @@ meta_frame_layout_new  (void)
   layout->metacity.button_width = -1;
   layout->metacity.button_height = -1;
 
-  layout->invisible_border.left = 10;
-  layout->invisible_border.right = 10;
-  layout->invisible_border.bottom = 10;
-  layout->invisible_border.top = 10;
+  layout->invisible_resize_border.left = 10;
+  layout->invisible_resize_border.right = 10;
+  layout->invisible_resize_border.bottom = 10;
+  layout->invisible_resize_border.top = 10;
 
   init_border (&layout->button_border);
 
diff --git a/libmetacity/meta-frame-layout.h b/libmetacity/meta-frame-layout.h
index 3bff203..23b9791 100644
--- a/libmetacity/meta-frame-layout.h
+++ b/libmetacity/meta-frame-layout.h
@@ -121,8 +121,8 @@ struct _MetaFrameLayout
     gint button_height;
   } metacity;
 
-  /** Invisible border */
-  GtkBorder invisible_border;
+  /** Invisible resize area border */
+  GtkBorder invisible_resize_border;
 
   /** Space around buttons */
   GtkBorder button_border;
diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c
index 05d5b6a..1bf1221 100644
--- a/libmetacity/meta-theme-gtk.c
+++ b/libmetacity/meta-theme-gtk.c
@@ -212,14 +212,15 @@ frame_layout_sync_with_style (MetaFrameLayout *layout,
   if (composited)
     {
       /* With compositing manager: margin is resize area */
-      get_margin (style, &layout->invisible_border);
+      get_margin (style, &layout->invisible_resize_border);
     }
   else
     {
-      layout->invisible_border.top = 0;
-      layout->invisible_border.bottom = 0;
-      layout->invisible_border.left = 0;
-      layout->invisible_border.right = 0;
+      /* Without compositing manager we can not have invisible border */
+      layout->invisible_resize_border.top = 0;
+      layout->invisible_resize_border.bottom = 0;
+      layout->invisible_resize_border.left = 0;
+      layout->invisible_resize_border.right = 0;
 
       /* Without compositing manager: margin is part of border */
       get_margin (style, &border);
@@ -338,27 +339,19 @@ meta_theme_gtk_get_frame_borders (MetaThemeImpl    *impl,
   borders->visible.right = layout->gtk.frame_border.right;
   borders->visible.bottom = layout->gtk.frame_border.bottom;
 
-  /* FIXME: invisible = MAX (margin, shadow) */
-  borders->invisible.left = layout->invisible_border.left;
-  borders->invisible.right = layout->invisible_border.right;
-  borders->invisible.bottom = layout->invisible_border.bottom;
-  borders->invisible.top = layout->invisible_border.top;
-
-  /*
   if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
     {
-      borders->invisible.left = layout->invisible_border.left;
-      borders->invisible.right = layout->invisible_border.right;
+      borders->invisible.left = layout->invisible_resize_border.left;
+      borders->invisible.right = layout->invisible_resize_border.right;
     }
 
   if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
     {
-      borders->invisible.bottom = layout->invisible_border.bottom;
+      borders->invisible.bottom = layout->invisible_resize_border.bottom;
 
       if (type != META_FRAME_TYPE_ATTACHED)
-        borders->invisible.top = layout->invisible_border.top;
+        borders->invisible.top = layout->invisible_resize_border.top;
     }
-  */
 
   borders->total.left = borders->invisible.left + borders->visible.left;
   borders->total.right = borders->invisible.right + borders->visible.right;
diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c
index e42e78c..0942693 100644
--- a/libmetacity/meta-theme-metacity.c
+++ b/libmetacity/meta-theme-metacity.c
@@ -4647,16 +4647,16 @@ meta_theme_metacity_get_frame_borders (MetaThemeImpl    *impl,
 
   if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
     {
-      borders->invisible.left = layout->invisible_border.left;
-      borders->invisible.right = layout->invisible_border.right;
+      borders->invisible.left = layout->invisible_resize_border.left;
+      borders->invisible.right = layout->invisible_resize_border.right;
     }
 
   if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
     {
-      borders->invisible.bottom = layout->invisible_border.bottom;
+      borders->invisible.bottom = layout->invisible_resize_border.bottom;
 
       if (type != META_FRAME_TYPE_ATTACHED)
-        borders->invisible.top = layout->invisible_border.top;
+        borders->invisible.top = layout->invisible_resize_border.top;
     }
 
   borders->total.left = borders->invisible.left + borders->visible.left;