mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: Simplify unlock dialog redraw function

Browse Source
This commit is contained in:
Kristian Høgsberg
2012-03-05 20:37:51 -05:00
parent 65bec2452e
commit 41c5c4ee9a
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/desktop-shell.c
+6 -10
View File
@@ -446,17 +446,15 @@ unlock_dialog_redraw_handler(struct widget *widget, void *data)
surface = window_get_surface(dialog->window); surface = window_get_surface(dialog->window);
cr = cairo_create(surface); cr = cairo_create(surface);
widget_get_allocation(dialog->widget, &allocation); widget_get_allocation(dialog->widget, &allocation);
cairo_rectangle(cr, allocation.x, allocation.y, cairo_rectangle(cr, allocation.x, allocation.y,
allocation.width, allocation.height); allocation.width, allocation.height);
cairo_clip(cr);
cairo_push_group(cr);
cairo_translate(cr, allocation.x, allocation.y);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
cairo_set_source_rgba(cr, 0, 0, 0, 0.6); cairo_set_source_rgba(cr, 0, 0, 0, 0.6);
cairo_paint(cr); cairo_fill(cr);
cairo_translate(cr, allocation.x, allocation.y);
if (dialog->button_focused) if (dialog->button_focused)
f = 1.0; f = 1.0;
else else
@@ -470,16 +468,14 @@ unlock_dialog_redraw_handler(struct widget *widget, void *data)
cairo_pattern_add_color_stop_rgb(pat, 0.85, 0.2 * f, f, 0.2 * f); cairo_pattern_add_color_stop_rgb(pat, 0.85, 0.2 * f, f, 0.2 * f);
cairo_pattern_add_color_stop_rgb(pat, 1.0, 0, 0.86 * f, 0); cairo_pattern_add_color_stop_rgb(pat, 1.0, 0, 0.86 * f, 0);
cairo_set_source(cr, pat); cairo_set_source(cr, pat);
cairo_pattern_destroy(pat);
cairo_arc(cr, cx, cy, r, 0.0, 2.0 * M_PI); cairo_arc(cr, cx, cy, r, 0.0, 2.0 * M_PI);
cairo_fill(cr); cairo_fill(cr);
widget_set_allocation(dialog->button, widget_set_allocation(dialog->button,
allocation.x + cx - r, allocation.x + cx - r,
allocation.y + cy - r, 2 * r, 2 * r); allocation.y + cy - r, 2 * r, 2 * r);
cairo_pattern_destroy(pat);
cairo_pop_group_to_source(cr);
cairo_paint(cr);
cairo_destroy(cr); cairo_destroy(cr);
cairo_surface_destroy(surface); cairo_surface_destroy(surface);