platform, fix some minor kbd issues

diff --git a/platform/common/keyboard.c b/platform/common/keyboard.c
index 4719b6b..4b9027a 100644 (file)
--- a/platform/common/keyboard.c
+++ b/platform/common/keyboard.c
@@ -203,6 +203,7 @@ void vkbd_draw(struct vkbd *vkbd)
        int ypos = (vkbd->top ? 0 : g_screen_height - KBD_ROWS*me_sfont_h);
 
 // HACK: smalltext_out is only available on menuscreen :-/
+int w = g_menuscreen_w, h = g_menuscreen_h;
 g_menuscreen_ptr = (u16 *)g_screen_ptr;
 g_menuscreen_pp = g_screen_ppitch;
 g_menuscreen_w = g_screen_width;
@@ -236,6 +237,8 @@ if (g_screen_width >= 320) {
                        smalltext_out16(xpos, ypos+i*me_sfont_h, text, color);
                }
        }
+
+g_menuscreen_w = w, g_menuscreen_h = h;
 }
 
 int vkbd_update(struct vkbd *vkbd, int input, int *actions)

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 480d8cf..577a23d 100644 (file)
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -520,9 +520,9 @@ int key_config_kbd_loop(int id, int keys)
 
                        key = &kbd[keyy][keyx];
                        menu_draw_begin(1, 0);
-                       text_out16(x, 2 * me_mfont_h, "== %s Keyboard ==", toggle ? "SC-3000" : "Pico");
+                       text_out16(x - w, 2 * me_mfont_h, "Keyboard type: %s", toggle ? "SC-3000" : "Pico");
                        kbd_draw(kbd, shift, (g_menuscreen_w - 320)/2, 4 * me_mfont_h, key);
-                       text_out16(x, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind");
+                       text_out16(x - 2*w, g_menuscreen_h - 4 * me_mfont_h, "Press a button to bind/unbind");
                        menu_draw_end();
 
                        /* wait for some up event */