diff options
| author | Victor Kareh <[email protected]> | 2019-05-21 13:15:48 -0400 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2019-06-05 10:49:37 -0400 |
| commit | d05c1f4677ab3dda3ad2b5964a554aec8611fdcc (patch) | |
| tree | 0b78189c3d7b2ca6d01945f62d409fa4ab06ec0d /src/ui | |
| parent | c66b32666e48996b97e691ed002f86b6ff18dec5 (diff) | |
| download | marco-d05c1f4677ab3dda3ad2b5964a554aec8611fdcc.tar.bz2 marco-d05c1f4677ab3dda3ad2b5964a554aec8611fdcc.tar.xz | |
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
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/preview-widget.c | 22 | ||||
| -rw-r--r-- | src/ui/preview-widget.h | 1 | ||||
| -rw-r--r-- | src/ui/theme.c | 16 | ||||
| -rw-r--r-- | src/ui/ui.c | 5 |
4 files changed, 10 insertions, 34 deletions
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c index 6c819707..2928d3b1 100644 --- a/src/ui/preview-widget.c +++ b/src/ui/preview-widget.c @@ -98,10 +98,7 @@ meta_preview_init (MetaPreview *preview) META_FRAME_ALLOWS_SHADE | META_FRAME_ALLOWS_MOVE; - preview->borders.visible.left = -1; - preview->borders.visible.right = -1; - preview->borders.visible.top = -1; - preview->borders.visible.bottom = -1; + preview->borders_cached = FALSE; } GtkWidget* @@ -172,23 +169,17 @@ ensure_info (MetaPreview *preview) pango_font_description_free (font_desc); } - if (preview->borders.visible.top < 0) + if (!preview->borders_cached) { if (preview->theme) - { meta_theme_get_frame_borders (preview->theme, preview->type, preview->text_height, preview->flags, &preview->borders); - } else - { - preview->borders.visible.top = 0; - preview->borders.visible.bottom = 0; - preview->borders.visible.left = 0; - preview->borders.visible.right = 0; - } + meta_frame_borders_clear (&preview->borders); + preview->borders_cached = TRUE; } } @@ -362,10 +353,7 @@ clear_cache (MetaPreview *preview) preview->layout = NULL; } - preview->borders.visible.left = -1; - preview->borders.visible.right = -1; - preview->borders.visible.top = -1; - preview->borders.visible.bottom = -1; + preview->borders_cached = FALSE; } void diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h index 11818588..898a226d 100644 --- a/src/ui/preview-widget.h +++ b/src/ui/preview-widget.h @@ -51,6 +51,7 @@ struct _MetaPreview int text_height; MetaFrameBorders borders; + guint borders_cached : 1; MetaButtonLayout button_layout; }; diff --git a/src/ui/theme.c b/src/ui/theme.c index 37298e42..299f1cc2 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; } } @@ -5656,10 +5649,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) diff --git a/src/ui/ui.c b/src/ui/ui.c index e7993625..cc26451e 100644 --- a/src/ui/ui.c +++ b/src/ui/ui.c @@ -685,10 +685,7 @@ meta_ui_theme_get_frame_borders (MetaUI *ui, } else { - borders->visible.top = 0; - borders->visible.bottom = 0; - borders->visible.left = 0; - borders->visible.right = 0; + meta_frame_borders_clear (borders); } if (style != NULL) |