layout: Remove width

1 files changed, 4 insertions, 4 deletions

diff --git a/keyboard.c b/keyboard.c
index ee50827..a964c34 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -44,10 +44,10 @@ kbd_init_layout(struct layout *l, uint32_t width, uint32_t height) {
 			y += l->keyheight;
 			x = 0;
 			rowlength = kbd_get_row_length(k + 1);
-		} else if (k->width > 0) {
+		} else if (k->type == Code) {
 			k->x = x;
 			k->y = y;
-			k->w = ((double)width / rowlength) * k->width;
+			k->w = width / rowlength;
 			x += k->w;
 		}
 		k->h = l->keyheight;
@@ -59,7 +59,7 @@ double
 kbd_get_row_length(struct key *k) {
 	double l = 0.0;
 	while ((k->type != Last) && (k->type != EndRow)) {
-		l += k->width;
+		l += 1.0;
 		k++;
 	}
 	return l;
@@ -132,7 +132,7 @@ kbd_draw_key(struct kbd *kb, struct key *k, enum key_draw_type type) {
 	if (kb->debug)
 		fprintf(stderr, "Draw key +%d+%d %dx%d -> %s\n", k->x, k->y, k->w, k->h,
 		        label);
-	struct clr_scheme *scheme = (k->scheme == 0) ? &(kb->scheme) : &(kb->scheme1);
+	struct clr_scheme *scheme = &(kb->scheme);
 	switch (type) {
 	case Unpress:
 		draw_inset(d, k->x, k->y, k->w, k->h, KBD_KEY_BORDER, scheme->fg);