isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

theme: Scrap meta_theme_draw_frame

Browse Source 
The more public symbols we remove, the closer we get to
not supporting the legacy theme API at all...
This commit is contained in:
Jasper St. Pierre 2012-05-05 00:00:47 -03:00
parent 5053997021
commit 25815473e6
4 changed files with 23 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,17 +177,18 @@ meta_preview_draw (GtkWidget *widget,
if (client_height < 0)
client_height = 1;
meta_theme_draw_frame (preview->theme,
widget,
cr,
preview->type,
preview->flags,
client_width, client_height,
preview->layout,
&preview->button_layout,
button_states,
meta_preview_get_mini_icon (),
meta_preview_get_icon ());
meta_theme_draw_frame_with_style (preview->theme,
gtk_widget_get_style_context (widget),
cr,
preview->type,
preview->flags,
client_width,
client_height,
preview->layout,
&preview->button_layout,
button_states,
meta_preview_get_mini_icon (),
meta_preview_get_icon ());
cairo_restore (cr);
}

13
src/ui/theme-private.h
View File

@ -1007,19 +1007,6 @@ void meta_theme_render_background (GtkStyleContext *style,
const MetaFrameGeometry *fgeom,
PangoLayout *title_layout);
void meta_theme_draw_frame (MetaTheme *theme,
GtkWidget *widget,
cairo_t *cr,
MetaFrameType type,
MetaFrameFlags flags,
int client_width,
int client_height,
PangoLayout *title_layout,
const MetaButtonLayout *button_layout,
MetaButtonState button_states[META_BUTTON_TYPE_LAST],
GdkPixbuf *mini_icon,
GdkPixbuf *icon);
void meta_theme_draw_frame_with_style (MetaTheme *theme,
GtkStyleContext *style_gtk,
cairo_t *cr,

22
src/ui/theme-viewer.c
View File

@ -1006,17 +1006,17 @@ run_theme_benchmark (void)
cr = cairo_create (pixmap);
meta_theme_draw_frame (global_theme,
widget,
cr,
META_FRAME_TYPE_NORMAL,
get_flags (widget),
client_width, client_height,
layout,
&button_layout,
button_states,
meta_preview_get_mini_icon (),
meta_preview_get_icon ());
meta_theme_draw_frame_with_style (global_theme,
gtk_widget_get_style_context (widget),
cr,
META_FRAME_TYPE_NORMAL,
get_flags (widget),
client_width, client_height,
layout,
&button_layout,
button_states,
meta_preview_get_mini_icon (),
meta_preview_get_icon ());
cairo_destroy (cr);
cairo_surface_destroy (pixmap);

22
src/ui/theme.c
View File

@ -5054,28 +5054,6 @@ meta_theme_draw_frame_with_style (MetaTheme *theme,
mini_icon, icon);
}
void
meta_theme_draw_frame (MetaTheme *theme,
GtkWidget *widget,
cairo_t *cr,
MetaFrameType type,
MetaFrameFlags flags,
int client_width,
int client_height,
PangoLayout *title_layout,
const MetaButtonLayout *button_layout,
MetaButtonState button_states[META_BUTTON_TYPE_LAST],
GdkPixbuf *mini_icon,
GdkPixbuf *icon)
{
meta_theme_draw_frame_with_style (theme, gtk_widget_get_style_context (widget),
cr, type,flags,
client_width, client_height,
title_layout,
button_layout, button_states,
mini_icon, icon);
}
void
meta_theme_get_frame_borders (MetaTheme *theme,
GtkStyleContext *style_context,