jtheoof/swappy
1
1
Fork 0
mirror of https://github.com/jtheoof/swappy.git synced 2024-08-16 18:20:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

draw: add paint size

Browse Source
This commit is contained in:
Jeremy Attali 2019-12-22 12:09:44 -05:00
parent f2432a0aaa
commit be90fffa14
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/swappy.h
View File

@ -35,6 +35,11 @@ struct swappy_point {
};
struct swappy_shape {
double r;
double g;
double b;
double a;
double w;
struct swappy_point from;
struct swappy_point to;
enum swappy_paint_mode_type type;
@ -47,6 +52,7 @@ struct swappy_brush_point {
double g;
double b;
double a;
double w;
enum swappy_brush_point_kind kind;
};

6
src/application.c
View File

@ -212,6 +212,7 @@ static void brush_add_point(struct swappy_state *state, double x, double y,
point->g = 0;
point->b = 0;
point->a = 1;
point->w = 2;
point->kind = kind;
state->brushes = g_slist_append(state->brushes, point);
@ -223,6 +224,11 @@ static void paint_add_temporary(struct swappy_state *state, double x, double y,
temp->from.x = x;
temp->from.y = y;
temp->r = 1;
temp->g = 0;
temp->b = 0;
temp->a = 1;
temp->w = 2;
temp->type = type;
if (state->temp_shape) {

16
src/draw.c
View File

@ -34,8 +34,8 @@ static void apply_output_transform(enum wl_output_transform transform,
}
static void draw_shape_arrow(cairo_t *cr, struct swappy_shape *shape) {
cairo_set_source_rgba(cr, 1, 0, 0, 1);
cairo_set_line_width(cr, 2);
cairo_set_source_rgba(cr, shape->r, shape->g, shape->b, shape->a);
cairo_set_line_width(cr, shape->w);
cairo_move_to(cr, shape->from.x, shape->from.y);
cairo_line_to(cr, shape->to.x, shape->to.y);
@ -82,8 +82,8 @@ static void draw_shape_ellipse(cairo_t *cr, struct swappy_shape *shape) {
double n = sqrt(x * x + y * y);
double r = n / 2;
cairo_set_source_rgba(cr, 1, 0, 0, 1);
cairo_set_line_width(cr, 2);
cairo_set_source_rgba(cr, shape->r, shape->g, shape->b, shape->a);
cairo_set_line_width(cr, shape->w);
cairo_matrix_t save_matrix;
cairo_get_matrix(cr, &save_matrix);
@ -101,8 +101,8 @@ static void draw_shape_rectangle(cairo_t *cr, struct swappy_shape *shape) {
double w = fabs(shape->from.x - shape->to.x);
double h = fabs(shape->from.y - shape->to.y);
cairo_set_source_rgba(cr, 1, 0, 0, 1);
cairo_set_line_width(cr, 2);
cairo_set_source_rgba(cr, shape->r, shape->g, shape->b, shape->a);
cairo_set_line_width(cr, shape->w);
cairo_rectangle(cr, x, y, w, h);
cairo_close_path(cr);
@ -207,14 +207,14 @@ static void draw_brushes(cairo_t *cr, struct swappy_state *state) {
if (brush_next && point->kind == SWAPPY_BRUSH_POINT_WITHIN) {
struct swappy_brush_point *next = brush_next->data;
cairo_set_source_rgba(cr, point->r, point->g, point->b, point->a);
cairo_set_line_width(cr, 2);
cairo_set_line_width(cr, point->w);
cairo_move_to(cr, point->x, point->y);
cairo_line_to(cr, next->x, next->y);
cairo_set_line_join(cr, CAIRO_LINE_JOIN_BEVEL);
cairo_stroke(cr);
} else {
cairo_set_source_rgba(cr, point->r, point->g, point->b, point->a);
cairo_set_line_width(cr, 2);
cairo_set_line_width(cr, point->w);
cairo_rectangle(cr, point->x, point->y, 1, 1);
cairo_stroke(cr);
}