mirror of
https://github.com/jjsullivan5196/wvkbd.git
synced 2025-03-13 02:42:47 +01:00
Prevent writing outside of key without ellipsize
This commit is contained in:
parent
8f7142b171
commit
4444c6e664
10
drw.c
10
drw.c
@ -47,9 +47,15 @@ drw_draw_text(struct drwsurf *d, Color color, uint32_t x, uint32_t y,
|
||||
|
||||
// if a word is too long, cairo let it, and ignore our width
|
||||
if (width < (w - (b*2))) {
|
||||
cairo_rel_move_to(d->cairo, - width / 2, - height / 2);
|
||||
cairo_rel_move_to(d->cairo, - width / 2, 0);
|
||||
} else {
|
||||
cairo_rel_move_to(d->cairo, - w / 2 + b, - height / 2);
|
||||
cairo_rel_move_to(d->cairo, - w / 2 + b, 0);
|
||||
}
|
||||
|
||||
if (height < (h - (b*2))) {
|
||||
cairo_rel_move_to(d->cairo, 0, - height / 2);
|
||||
} else {
|
||||
cairo_rel_move_to(d->cairo, 0, - h / 2);
|
||||
}
|
||||
|
||||
pango_cairo_show_layout(d->cairo, d->layout);
|
||||
|
@ -525,6 +525,10 @@ kbd_draw_key(struct kbd *kb, struct key *k, enum key_draw_type type) {
|
||||
drw_do_rectangle(d, kb->scheme.bg, right_part_x, k->y,
|
||||
kb->w - right_part_x, k->h, false);
|
||||
|
||||
uint32_t bottom_part_y = k->y + k->h - 1 * KBD_KEY_BORDER;
|
||||
drw_do_rectangle(d, kb->scheme.bg, k->x, bottom_part_y,
|
||||
kb->h - bottom_part_y, k->w, false);
|
||||
|
||||
wl_surface_damage(d->surf, k->x, k->y, k->w, k->h);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user