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

eeshow/gui-over.c (overlay_draw): simplify; correct reverse alignment

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-14 14:52:07 -03:00
parent a61560f119
commit 8d465b0da0
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeshow/gui-over.c
View File

@ -76,7 +76,6 @@ static unsigned overlay_draw(struct overlay *over, cairo_t *cr,
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 */
int sx, sy; /* box start position */
PangoLayout *layout; PangoLayout *layout;
PangoFontDescription *desc; PangoFontDescription *desc;
@ -102,8 +101,6 @@ fprintf(stderr, "%d + %d %d + %d\n",
w = ink_w + 2 * style->pad; w = ink_w + 2 * style->pad;
h = ink_h + 2 * style->pad; h = ink_h + 2 * style->pad;
sx = x;
sy = y;
if (dx < 0 || dy < 0) { if (dx < 0 || dy < 0) {
double x1, y1, x2, y2; double x1, y1, x2, y2;
int sw, sh; int sw, sh;
@ -112,15 +109,15 @@ fprintf(stderr, "%d + %d %d + %d\n",
sw = x2 - x1; sw = x2 - x1;
sh = y2 - y1; sh = y2 - y1;
if (dx < 0) if (dx < 0)
sx = sw + sx - w; x = sw - x - w;
if (dy < 0) if (dy < 0)
sy = sh + sy - h; y = sh - y - h;
} }
tx = sx - ink_rect.x / PANGO_SCALE + style->pad; tx = x - ink_rect.x / PANGO_SCALE + style->pad;
ty = sy - ink_rect.y / PANGO_SCALE + style->pad; ty = y - ink_rect.y / PANGO_SCALE + style->pad;
rrect(cr, sx, sy, w, h, style->radius); rrect(cr, x, y, w, h, style->radius);
cairo_set_source_rgba(cr, bg->r, bg->g, bg->b, bg->alpha); cairo_set_source_rgba(cr, bg->r, bg->g, bg->b, bg->alpha);
cairo_fill_preserve(cr); cairo_fill_preserve(cr);
@ -159,8 +156,8 @@ fprintf(stderr, "%u(%d) %u %.60s\n", ty, ink_rect.y / PANGO_SCALE, ink_h, over->
if (over->hover || over->click || over->drag) { if (over->hover || over->click || over->drag) {
struct aoi aoi_cfg = { struct aoi aoi_cfg = {
.x = sx, .x = x,
.y = sy, .y = y,
.w = w, .w = w,
.h = h, .h = h,
.hover = over->hover, .hover = over->hover,