qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-23 01:51:33 +02:00
Code

eeshow/gui-over.h: use struct for color, instead of array

Browse Source 
That way, we can use assignments on them.
This commit is contained in:
Werner Almesberger 2016-08-09 16:01:01 -03:00
parent f973abd98c
commit 6bb814bae6
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeshow/gui-over.c
View File

@ -68,9 +68,9 @@ static void rrect(cairo_t *cr, int x, int y, int w, int h, int r)
struct overlay *overlay_draw(struct overlay *over, cairo_t *cr, int *x, int *y) struct overlay *overlay_draw(struct overlay *over, cairo_t *cr, int *x, int *y)
{ {
const struct overlay_style *style = &over->style; const struct overlay_style *style = &over->style;
const double *fg = style->fg; const struct color *fg = &style->fg;
const double *bg = style->bg; const struct color *bg = &style->bg;
const double *frame = style->frame; const struct color *frame = &style->frame;
unsigned ink_w, ink_h; /* effectively used text area size */ unsigned ink_w, ink_h; /* effectively used text area size */
unsigned w, h; /* box size */ unsigned w, h; /* box size */
int tx, ty; /* text start position */ int tx, ty; /* text start position */
@ -120,9 +120,9 @@ fprintf(stderr, "%d + %d %d + %d\n",
rrect(cr, sx, sy, w, h, style->radius); rrect(cr, sx, sy, w, h, style->radius);
cairo_set_source_rgba(cr, bg[0], bg[1], bg[2], bg[3]); cairo_set_source_rgba(cr, bg->r, bg->g, bg->b, bg->alpha);
cairo_fill_preserve(cr); cairo_fill_preserve(cr);
cairo_set_source_rgba(cr, frame[0], frame[1], frame[2], frame[3]); cairo_set_source_rgba(cr, frame->r, frame->g, frame->b, frame->alpha);
cairo_set_line_width(cr, style->width); cairo_set_line_width(cr, style->width);
cairo_stroke(cr); cairo_stroke(cr);
@ -147,7 +147,7 @@ fprintf(stderr, "%u(%d) %u %.60s\n", ty, ink_rect.y / PANGO_SCALE, ink_h, over->
cairo_clip(cr); cairo_clip(cr);
} }
cairo_set_source_rgba(cr, fg[0], fg[1], fg[2], fg[3]); cairo_set_source_rgba(cr, fg->r, fg->g, fg->b, fg->alpha);
cairo_move_to(cr, tx, ty); cairo_move_to(cr, tx, ty);
pango_cairo_update_layout(cr, layout); pango_cairo_update_layout(cr, layout);

11
eeshow/gui-over.h
View File

@ -21,15 +21,20 @@
#include "gui-aoi.h" #include "gui-aoi.h"
struct color {
double r, g, b, alpha;
};
struct overlay_style { struct overlay_style {
const char *font; const char *font;
unsigned wmin, wmax; unsigned wmin, wmax;
unsigned radius; unsigned radius;
unsigned pad; /* in x and y direction; adjust for radius ! */ unsigned pad; /* in x and y direction; adjust for radius ! */
unsigned skip; /* should be list-specific */ unsigned skip; /* should be list-specific */
double fg[4]; struct color fg;
double bg[4]; struct color bg;
double frame[4]; struct color frame;
double width; double width;
}; };