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

Move rounded_rect() to cairo-util.c

Browse Source
This commit is contained in:
Kristian Høgsberg
2011-09-13 14:47:46 -04:00
parent 547da5afc9
commit 1e164b9afd
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clients/cairo-util.c
+14
View File
@@ -262,3 +262,17 @@ tile_source(cairo_t *cr, cairo_surface_t *surface,
margin, height - margin - top_margin); margin, height - margin - top_margin);
cairo_fill(cr); cairo_fill(cr);
} }
void
rounded_rect(cairo_t *cr, int x0, int y0, int x1, int y1, int radius)
{
cairo_move_to(cr, x0, y0 + radius);
cairo_arc(cr, x0 + radius, y0 + radius, radius, M_PI, 3 * M_PI / 2);
cairo_line_to(cr, x1 - radius, y0);
cairo_arc(cr, x1 - radius, y0 + radius, radius, 3 * M_PI / 2, 2 * M_PI);
cairo_line_to(cr, x1, y1 - radius);
cairo_arc(cr, x1 - radius, y1 - radius, radius, 0, M_PI / 2);
cairo_line_to(cr, x0 + radius, y1);
cairo_arc(cr, x0 + radius, y1 - radius, radius, M_PI / 2, M_PI);
cairo_close_path(cr);
}
clients/cairo-util.h
+3
View File
@@ -34,4 +34,7 @@ void
tile_source(cairo_t *cr, cairo_surface_t *surface, tile_source(cairo_t *cr, cairo_surface_t *surface,
int x, int y, int width, int height, int margin, int top_margin); int x, int y, int width, int height, int margin, int top_margin);
void
rounded_rect(cairo_t *cr, int x0, int y0, int x1, int y1, int radius);
#endif #endif
clients/window.c
-14
View File
@@ -172,20 +172,6 @@ static const GOptionEntry xkb_option_entries[] = {
{ NULL } { NULL }
}; };
static void
rounded_rect(cairo_t *cr, int x0, int y0, int x1, int y1, int radius)
{
cairo_move_to(cr, x0, y0 + radius);
cairo_arc(cr, x0 + radius, y0 + radius, radius, M_PI, 3 * M_PI / 2);
cairo_line_to(cr, x1 - radius, y0);
cairo_arc(cr, x1 - radius, y0 + radius, radius, 3 * M_PI / 2, 2 * M_PI);
cairo_line_to(cr, x1, y1 - radius);
cairo_arc(cr, x1 - radius, y1 - radius, radius, 0, M_PI / 2);
cairo_line_to(cr, x0 + radius, y1);
cairo_arc(cr, x0 + radius, y1 - radius, radius, M_PI / 2, M_PI);
cairo_close_path(cr);
}
static const cairo_user_data_key_t surface_data_key; static const cairo_user_data_key_t surface_data_key;
struct surface_data { struct surface_data {
struct wl_buffer *buffer; struct wl_buffer *buffer;