From 860f7a6dbc81272c561a1b8d045e5ff61ea0e66a Mon Sep 17 00:00:00 2001 From: Victor Kareh Date: Tue, 21 May 2019 13:15:48 -0400 Subject: MetaFrameBorders: Add meta_frame_borders_clear Just a quick little commit to help clean things up for when we add invisible borders. Additionally, do a little housekeeping in preview-widget as well. https://bugzilla.gnome.org/show_bug.cgi?id=644930 NOTE: Patch copied from metacity and adapted for marco. upstream commit: https://gitlab.gnome.org/GNOME/metacity/commit/7d519b3f --- src/ui/theme.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'src/ui/theme.c') diff --git a/src/ui/theme.c b/src/ui/theme.c index 20cf6913..d673134c 100644 --- a/src/ui/theme.c +++ b/src/ui/theme.c @@ -219,11 +219,6 @@ meta_frame_layout_new (void) layout->right_width = -1; layout->bottom_height = -1; - layout->invisible_border.left = 10; - layout->invisible_border.right = 10; - layout->invisible_border.bottom = 10; - layout->invisible_border.top = 10; - init_border (&layout->title_border); layout->title_vertical_pad = -1; @@ -430,10 +425,8 @@ meta_frame_layout_get_borders (const MetaFrameLayout *layout, if (flags & META_FRAME_FULLSCREEN) { - borders->visible.top = 0; - borders->visible.bottom = 0; - borders->visible.left = 0; - borders->visible.right = 0; + meta_frame_borders_clear (borders); + return; } } @@ -5658,10 +5651,7 @@ meta_theme_get_frame_borders (MetaTheme *theme, style = theme_get_style (theme, type, flags); - borders->visible.top = 0; - borders->visible.left = 0; - borders->visible.right = 0; - borders->visible.bottom = 0; + meta_frame_borders_clear (borders); /* Parser is not supposed to allow this currently */ if (style == NULL) -- cgit v1.2.1