fixing button height (again)

This commit is contained in:
Enno Boland (Gottox) 2011-04-13 09:46:51 +02:00
parent c74fc014a4
commit f3ec05ff37
1 changed files with 4 additions and 7 deletions

11
svkbd.c
View File

@ -452,20 +452,17 @@ unpress() {
void
updatekeys() {
int i, j;
int x = 0, y = 0, h, base, r = 0;
int x = 0, y = 0, h, base, r = rows;
h = (wh - 1) / rows;
for(i = 0; i < LENGTH(keys); i++) {
for(i = 0; i < LENGTH(keys); i++, r--) {
for(j = i, base = 0; j < LENGTH(keys) && keys[j].keysym != 0; j++)
base += keys[j].width;
for(x = 0; i < LENGTH(keys) && keys[i].keysym != 0; i++, r++) {
for(x = 0; i < LENGTH(keys) && keys[i].keysym != 0; i++) {
keys[i].x = x;
keys[i].y = y;
keys[i].w = keys[i].width * (ww - 1) / base;
if(rows == r - 1)
keys[i].h = wh - 1 - y;
else
keys[i].h = h;
keys[i].h = r == 1 ? wh - y : h;
x += keys[i].w;
}
if(base != 0)