Add special OSK keys to GLUI too

This commit is contained in:
Jean-André Santoni 2016-11-01 14:09:55 +01:00
parent f5cac72735
commit a7ecf7615d

View File

@ -294,22 +294,22 @@ static void mui_render_keyboard(mui_handle_t *mui, const char *grid[], unsigned
width, height,
&dark[0]);
for (i = 0; i <= 40; i++)
for (i = 0; i <= 44; i++)
{
int line_y;
int ptr_width = height / 12;
line_y = (i / 10)*height/10.0;
int ptr_width = height / 13;
line_y = (i / 11)*height/10.0;
if (i == id)
menu_display_draw_quad(
width/11.0 + (i % 10) * width/11.0 - ptr_width/2,
width/12.0 + (i % 11) * width/12.0 - ptr_width/2,
height*2.5/4.0 + line_y - ptr_width/2 - mui->font->size / 4,
ptr_width, ptr_width,
width, height,
&light[0]);
mui_draw_text(mui->font,
width/11.0 + (i % 10) * width/11.0,
width/12.0 + (i % 11) * width/12.0,
height*2.5/4.0 + line_y,
width, height, grid[i], 0xffffffff, TEXT_ALIGN_CENTER);
}
@ -326,11 +326,11 @@ static int mui_osk_ptr_at_pos(void *data, int x, int y)
video_driver_get_size(&width, &height);
for (i = 0; i <= 40; i++)
for (i = 0; i <= 44; i++)
{
int ptr_width = height / 12;
int line_y = (i / 10)*height/10.0;
int ptr_x = width/11.0 + (i % 10) * width/11.0 - ptr_width/2;
int ptr_width = height / 13;
int line_y = (i / 11)*height/10.0;
int ptr_x = width/12.0 + (i % 11) * width/12.0 - ptr_width/2;
int ptr_y = height*2.5/4.0 + line_y - ptr_width/2 - mui->font->size / 4;
if (x > ptr_x && x < ptr_x + ptr_width