meizu-m86/multirom_m86
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[t23] Fix keyboard having only upper-case letters

Browse Source 
* Caused by buttons automatically doing strtoupper()
* Bump trampoline version because keyboard is used in trampoline_encmnt
This commit is contained in:
Vojtech Bocek
2015-03-19 19:21:46 +01:00
parent 5950f62218
commit c34c410c9f
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/button.c
View File

@@ -41,13 +41,11 @@ void button_init_ui(button *b, const char *text, int size)
b->rect = fb_add_rect_lvl(b->level_off + LEVEL_RECT, b->x, b->y, b->w, b->h, b->c[CLR_NORMAL][0]);
char *uppertext = strtoupper(text);
fb_text_proto *p = fb_text_create(0, 0, b->c[CLR_NORMAL][1], size, uppertext);
fb_text_proto *p = fb_text_create(0, 0, b->c[CLR_NORMAL][1], size, text);
p->level = b->level_off + LEVEL_TEXT;
p->style = STYLE_MEDIUM;
b->text = fb_text_finalize(p);
center_text(b->text, b->x, b->y, b->w, b->h);
free(uppertext);
}
else
{

10
multirom_ui_landscape.c
View File

@@ -170,7 +170,7 @@ static void tab_misc_init(multirom_theme_data *t, tab_data_misc *d, int color_sc
b->h = MISCBTN_H;
b->clicked = &multirom_ui_tab_misc_copy_log;
shadow = fb_add_rect_lvl(LEVEL_RECT, b->x + BTN_SHADOW_OFF, b->y + BTN_SHADOW_OFF, b->w, b->h, C_BTN_FAKE_SHADOW);
button_init_ui(b, "Copy log to /sdcard", SIZE_NORMAL);
button_init_ui(b, "COPY LOG TO /SDCARD", SIZE_NORMAL);
list_add(&d->buttons, b);
list_add(&d->ui_elements, shadow);
tabview_add_item(t->tabs, TAB_MISC, b->text);
@@ -211,10 +211,10 @@ static void tab_misc_init(multirom_theme_data *t, tab_data_misc *d, int color_sc
static const char *texts[] =
{
"Reboot", // 0
"Reboot to recovery", // 1
"Reboot to bootloader", // 2
"Shutdown", // 3
"REBOOT", // 0
"REBOOT TO RECOVERY", // 1
"REBOOT TO BOOTLOADER", // 2
"SHUTDOWN", // 3
NULL
};

10
multirom_ui_portrait.c
View File

@@ -182,7 +182,7 @@ static void tab_misc_init(multirom_theme_data *t, tab_data_misc *d, int color_sc
b->h = MISCBTN_H;
b->clicked = &multirom_ui_tab_misc_copy_log;
shadow = fb_add_rect_lvl(LEVEL_RECT, b->x + BTN_SHADOW_OFF, b->y + BTN_SHADOW_OFF, b->w, b->h, C_BTN_FAKE_SHADOW);
button_init_ui(b, "Copy log to /sdcard", SIZE_NORMAL);
button_init_ui(b, "COPY LOG TO /SDCARD", SIZE_NORMAL);
list_add(&d->buttons, b);
list_add(&d->ui_elements, shadow);
tabview_add_item(t->tabs, TAB_MISC, b->text);
@@ -193,10 +193,10 @@ static void tab_misc_init(multirom_theme_data *t, tab_data_misc *d, int color_sc
static const char *texts[] =
{
"Reboot", // 0
"Reboot to recovery", // 1
"Reboot to bootloader", // 2
"Shutdown", // 3
"REBOOT", // 0
"REBOOT TO RECOVERY", // 1
"REBOOT TO BOOTLOADER", // 2
"SHUTDOWN", // 3
NULL
};

2
version.h
View File

@@ -18,7 +18,7 @@
#ifndef VERSION_H
#define VERSION_H
#define VERSION_MULTIROM 31
#define VERSION_TRAMPOLINE 22
#define VERSION_TRAMPOLINE 23
// For device-specific fixes. Use letters, the version will then be like "12a"
#define VERSION_DEV_FIX "v"