isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-05 16:14:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MetaFrameBorders: Add meta_frame_borders_clear

Browse Source 
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
This commit is contained in:
Jasper St. Pierre
2011-07-12 00:59:12 -04:00
parent e0fb83c691
commit ce9c7a210d
6 changed files with 30 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/ui/preview-widget.c
View File

@@ -93,11 +93,8 @@ meta_preview_init (MetaPreview *preview)
META_FRAME_HAS_FOCUS |
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*
@@ -168,23 +165,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);
}
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;
}
}
@@ -342,10 +333,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

11
src/ui/theme.c
View File

@@ -425,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;
}
}
@@ -5585,10 +5583,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)

5
src/ui/ui.c
View File

@@ -736,10 +736,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)