diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-02-07 16:40:56 +0200 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2016-02-07 18:29:48 +0200 |
| commit | 662d408f06bf3f4087cf0f5ff2a472523f250235 (patch) | |
| tree | 5548ffe01bed8fb125b96d6e12f93c8739b9c9fd /libmetacity/meta-theme-gtk.c | |
| parent | 6b030c99c53378932a02989ebb7aedd977aef9bc (diff) | |
| download | metacity-662d408f06bf3f4087cf0f5ff2a472523f250235.tar.gz | |
libmetacity: rename invisible_border to invisible_resize_border
Diffstat (limited to 'libmetacity/meta-theme-gtk.c')
| -rw-r--r-- | libmetacity/meta-theme-gtk.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c index 05d5b6a4..1bf12217 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; |