diff options
author | Robin Gareus <robin@gareus.org> | 2019-04-08 04:03:21 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-04-08 04:10:12 +0200 |
commit | f4c5e21a7a9249911679ad71cf814cbc2ab59d92 (patch) | |
tree | abcf9a9c9eb55bf61993a5f2ba5dd9e8d2bbdc7c /libs/clearlooks-newer/clearlooks_style.c | |
parent | 46f0b75e124e5c017e0fe1790769c2d2f28e7918 (diff) |
Undo incorrect sample/frame replacements in clearlooks
Diffstat (limited to 'libs/clearlooks-newer/clearlooks_style.c')
-rw-r--r-- | libs/clearlooks-newer/clearlooks_style.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/libs/clearlooks-newer/clearlooks_style.c b/libs/clearlooks-newer/clearlooks_style.c index c5e588b74f..fb0ca33239 100644 --- a/libs/clearlooks-newer/clearlooks_style.c +++ b/libs/clearlooks-newer/clearlooks_style.c @@ -200,16 +200,16 @@ clearlooks_style_draw_shadow (DRAW_ARGS) else if (DETAIL ("frame")) { WidgetParameters params; - FrameParameters sample; - sample.shadow = shadow_type; - sample.gap_x = -1; /* No gap will be drawn */ - sample.border = &colors->shade[4]; + FrameParameters frame; + frame.shadow = shadow_type; + frame.gap_x = -1; /* No gap will be drawn */ + frame.border = &colors->shade[4]; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_NONE; if (widget && !g_str_equal ("XfcePanelWindow", gtk_widget_get_name (gtk_widget_get_toplevel (widget)))) - STYLE_FUNCTION(draw_sample) (cr, colors, ¶ms, &sample, + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } else if (DETAIL ("scrolled_window") || DETAIL ("viewport") || detail == NULL) @@ -223,15 +223,15 @@ clearlooks_style_draw_shadow (DRAW_ARGS) else { WidgetParameters params; - FrameParameters sample; + FrameParameters frame; - sample.shadow = shadow_type; - sample.gap_x = -1; - sample.border = &colors->shade[5]; + frame.shadow = shadow_type; + frame.gap_x = -1; + frame.border = &colors->shade[5]; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_ALL; - STYLE_FUNCTION(draw_sample) (cr, colors, ¶ms, &sample, x, y, width, height); + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } cairo_destroy (cr); @@ -255,14 +255,14 @@ clearlooks_style_draw_box_gap (DRAW_ARGS, if (DETAIL ("notebook")) { WidgetParameters params; - FrameParameters sample; + FrameParameters frame; gboolean start, end; - sample.shadow = shadow_type; - sample.gap_side = gap_side; - sample.gap_x = gap_x; - sample.gap_width = gap_width; - sample.border = &colors->shade[5]; + frame.shadow = shadow_type; + frame.gap_side = gap_side; + frame.gap_x = gap_x; + frame.gap_width = gap_width; + frame.border = &colors->shade[5]; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); @@ -315,7 +315,7 @@ clearlooks_style_draw_box_gap (DRAW_ARGS, ge_cairo_set_color (cr, &colors->bg[GTK_STATE_NORMAL]); cairo_fill (cr); - STYLE_FUNCTION(draw_sample) (cr, colors, ¶ms, &sample, + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } else @@ -853,7 +853,7 @@ clearlooks_style_draw_box (DRAW_ARGS) clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); - STYLE_FUNCTION(draw_menu_sample) (cr, colors, ¶ms, x, y, width, height); + STYLE_FUNCTION(draw_menu_frame) (cr, colors, ¶ms, x, y, width, height); } else if (DETAIL ("hseparator") || DETAIL ("vseparator")) { @@ -1101,19 +1101,19 @@ clearlooks_style_draw_shadow_gap (DRAW_ARGS, if (DETAIL ("frame")) { WidgetParameters params; - FrameParameters sample; + FrameParameters frame; - sample.shadow = shadow_type; - sample.gap_side = gap_side; - sample.gap_x = gap_x; - sample.gap_width = gap_width; - sample.border = &colors->shade[5]; + frame.shadow = shadow_type; + frame.gap_side = gap_side; + frame.gap_x = gap_x; + frame.gap_width = gap_width; + frame.border = &colors->shade[5]; clearlooks_set_widget_parameters (widget, style, state_type, ¶ms); params.corners = CR_CORNER_ALL; - STYLE_FUNCTION(draw_sample) (cr, colors, ¶ms, &sample, + STYLE_FUNCTION(draw_frame) (cr, colors, ¶ms, &frame, x, y, width, height); } else |