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

theme: Remove unused "widget" parameter to frame style drawing

Browse Source 
It seems that the only usage of the "widget" parameter throughout
the entire call chain was to pass between two function calls as
mutual recursion.

https://bugzilla.gnome.org/show_bug.cgi?id=671104
This commit is contained in:
Jasper St. Pierre 2012-03-11 16:00:57 -04:00
parent 6900128b2f
commit b58366d3ad
3 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui/frames.c
View File

@ -2196,7 +2196,6 @@ meta_frames_paint (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
cairo_t *cr) cairo_t *cr)
{ {
GtkWidget *widget;
MetaFrameFlags flags; MetaFrameFlags flags;
MetaFrameType type; MetaFrameType type;
GdkPixbuf *mini_icon; GdkPixbuf *mini_icon;
@ -2209,7 +2208,6 @@ meta_frames_paint (MetaFrames *frames,
MetaGrabOp grab_op; MetaGrabOp grab_op;
Display *display; Display *display;
widget = GTK_WIDGET (frames);
display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
for (i = 0; i < META_BUTTON_TYPE_LAST; i++) for (i = 0; i < META_BUTTON_TYPE_LAST; i++)
@ -2308,7 +2306,6 @@ meta_frames_paint (MetaFrames *frames,
meta_theme_draw_frame_with_style (meta_theme_get_current (), meta_theme_draw_frame_with_style (meta_theme_get_current (),
frame->style, frame->style,
widget,
cr, cr,
type, type,
flags, flags,

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

@ -969,7 +969,6 @@ void meta_draw_op_free (MetaDrawOp *op);
void meta_draw_op_draw_with_style (const MetaDrawOp *op, void meta_draw_op_draw_with_style (const MetaDrawOp *op,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaDrawInfo *info, const MetaDrawInfo *info,
/* logical region being drawn */ /* logical region being drawn */
@ -980,7 +979,6 @@ void meta_draw_op_list_ref (MetaDrawOpList *op_list);
void meta_draw_op_list_unref (MetaDrawOpList *op_list); void meta_draw_op_list_unref (MetaDrawOpList *op_list);
void meta_draw_op_list_draw_with_style (const MetaDrawOpList *op_list, void meta_draw_op_list_draw_with_style (const MetaDrawOpList *op_list,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaDrawInfo *info, const MetaDrawInfo *info,
MetaRectangle rect); MetaRectangle rect);
@ -1011,7 +1009,6 @@ void meta_frame_style_unref (MetaFrameStyle *style);
void meta_frame_style_draw_with_style (MetaFrameStyle *style, void meta_frame_style_draw_with_style (MetaFrameStyle *style,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaFrameGeometry *fgeom, const MetaFrameGeometry *fgeom,
int client_width, int client_width,
@ -1063,7 +1060,6 @@ void meta_theme_draw_frame (MetaTheme *theme,
void meta_theme_draw_frame_with_style (MetaTheme *theme, void meta_theme_draw_frame_with_style (MetaTheme *theme,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
MetaFrameType type, MetaFrameType type,
MetaFrameFlags flags, MetaFrameFlags flags,

18
src/ui/theme.c
View File

@ -3623,7 +3623,6 @@ fill_env (MetaPositionExprEnv *env,
static void static void
meta_draw_op_draw_with_env (const MetaDrawOp *op, meta_draw_op_draw_with_env (const MetaDrawOp *op,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaDrawInfo *info, const MetaDrawInfo *info,
MetaRectangle rect, MetaRectangle rect,
@ -4033,7 +4032,7 @@ meta_draw_op_draw_with_env (const MetaDrawOp *op,
d_rect.height = parse_size_unchecked (op->data.op_list.height, env); d_rect.height = parse_size_unchecked (op->data.op_list.height, env);
meta_draw_op_list_draw_with_style (op->data.op_list.op_list, meta_draw_op_list_draw_with_style (op->data.op_list.op_list,
style_gtk, widget, cr, info, style_gtk, cr, info,
d_rect); d_rect);
} }
break; break;
@ -4071,7 +4070,7 @@ meta_draw_op_draw_with_env (const MetaDrawOp *op,
while (tile.y < (ry + rheight)) while (tile.y < (ry + rheight))
{ {
meta_draw_op_list_draw_with_style (op->data.tile.op_list, meta_draw_op_list_draw_with_style (op->data.tile.op_list,
style_gtk, widget, cr, info, style_gtk, cr, info,
tile); tile);
tile.y += tile.height; tile.y += tile.height;
@ -4092,7 +4091,6 @@ meta_draw_op_draw_with_env (const MetaDrawOp *op,
void void
meta_draw_op_draw_with_style (const MetaDrawOp *op, meta_draw_op_draw_with_style (const MetaDrawOp *op,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaDrawInfo *info, const MetaDrawInfo *info,
MetaRectangle logical_region) MetaRectangle logical_region)
@ -4101,7 +4099,7 @@ meta_draw_op_draw_with_style (const MetaDrawOp *op,
fill_env (&env, info, logical_region); fill_env (&env, info, logical_region);
meta_draw_op_draw_with_env (op, style_gtk, widget, cr, meta_draw_op_draw_with_env (op, style_gtk, cr,
info, logical_region, info, logical_region,
&env); &env);
@ -4161,7 +4159,6 @@ meta_draw_op_list_unref (MetaDrawOpList *op_list)
void void
meta_draw_op_list_draw_with_style (const MetaDrawOpList *op_list, meta_draw_op_list_draw_with_style (const MetaDrawOpList *op_list,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaDrawInfo *info, const MetaDrawInfo *info,
MetaRectangle rect) MetaRectangle rect)
@ -4208,7 +4205,7 @@ meta_draw_op_list_draw_with_style (const MetaDrawOpList *op_list,
else if (gdk_cairo_get_clip_rectangle (cr, NULL)) else if (gdk_cairo_get_clip_rectangle (cr, NULL))
{ {
meta_draw_op_draw_with_env (op, meta_draw_op_draw_with_env (op,
style_gtk, widget, cr, info, style_gtk, cr, info,
rect, rect,
&env); &env);
} }
@ -4599,7 +4596,6 @@ button_rect (MetaButtonType type,
void void
meta_frame_style_draw_with_style (MetaFrameStyle *style, meta_frame_style_draw_with_style (MetaFrameStyle *style,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
const MetaFrameGeometry *fgeom, const MetaFrameGeometry *fgeom,
int client_width, int client_width,
@ -4769,7 +4765,6 @@ meta_frame_style_draw_with_style (MetaFrameStyle *style,
m_rect = meta_rect (rect.x, rect.y, rect.width, rect.height); m_rect = meta_rect (rect.x, rect.y, rect.width, rect.height);
meta_draw_op_list_draw_with_style (op_list, meta_draw_op_list_draw_with_style (op_list,
style_gtk, style_gtk,
widget,
cr, cr,
&draw_info, &draw_info,
m_rect); m_rect);
@ -4811,7 +4806,6 @@ meta_frame_style_draw_with_style (MetaFrameStyle *style,
meta_draw_op_list_draw_with_style (op_list, meta_draw_op_list_draw_with_style (op_list,
style_gtk, style_gtk,
widget,
cr, cr,
&draw_info, &draw_info,
m_rect); m_rect);
@ -5447,7 +5441,6 @@ meta_theme_get_title_scale (MetaTheme *theme,
void void
meta_theme_draw_frame_with_style (MetaTheme *theme, meta_theme_draw_frame_with_style (MetaTheme *theme,
GtkStyleContext *style_gtk, GtkStyleContext *style_gtk,
GtkWidget *widget,
cairo_t *cr, cairo_t *cr,
MetaFrameType type, MetaFrameType type,
MetaFrameFlags flags, MetaFrameFlags flags,
@ -5482,7 +5475,6 @@ meta_theme_draw_frame_with_style (MetaTheme *theme,
meta_frame_style_draw_with_style (style, meta_frame_style_draw_with_style (style,
style_gtk, style_gtk,
widget,
cr, cr,
&fgeom, &fgeom,
client_width, client_height, client_width, client_height,
@ -5507,7 +5499,7 @@ meta_theme_draw_frame (MetaTheme *theme,
GdkPixbuf *mini_icon, GdkPixbuf *mini_icon,
GdkPixbuf *icon) GdkPixbuf *icon)
{ {
meta_theme_draw_frame_with_style (theme, gtk_widget_get_style_context (widget), widget, meta_theme_draw_frame_with_style (theme, gtk_widget_get_style_context (widget),
cr, type,flags, cr, type,flags,
client_width, client_height, client_width, client_height,
title_layout, text_height, title_layout, text_height,