notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Undeffing FORKED_FONTS seems to improve things on Android. The system onscreen keyboard hid the progress bar, don't show it until fonts are already in place.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2020-05-05 00:24:42 +02:00
parent 703696bb9b
commit 2a430c0dc0
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/fonts.h
View file

@ -34,7 +34,9 @@
#ifdef __APPLE__ #ifdef __APPLE__
#undef FORKED_FONTS #undef FORKED_FONTS
#endif #endif
#ifdef __ANDROID__
#undef FORKED_FONTS
#endif
#include "SDL.h" #include "SDL.h"
#include "SDL_ttf.h" #include "SDL_ttf.h"

15
src/tuxpaint.c
View file

@ -3295,13 +3295,6 @@ static void mainloop(void)
SDL_BlitSurface(kbd->surface, &kbd->rect, screen, &kbd_rect); SDL_BlitSurface(kbd->surface, &kbd->rect, screen, &kbd_rect);
update_screen_rect(&kbd_rect); update_screen_rect(&kbd_rect);
} }
if (onscreen_keyboard && !kbd)
{
r_tir.y = (float)event.button.y / render_scale;
SDL_SetTextInputRect(&r_tir);
SDL_StartTextInput();
}
if (!font_thread_done) if (!font_thread_done)
{ {
draw_colors(COLORSEL_DISABLE); draw_colors(COLORSEL_DISABLE);
@ -3329,6 +3322,12 @@ static void mainloop(void)
set_label_fonts(); set_label_fonts();
do_setcursor(cursor_arrow); do_setcursor(cursor_arrow);
} }
if (onscreen_keyboard && !kbd)
{
r_tir.y = (float)event.button.y / render_scale;
SDL_SetTextInputRect(&r_tir);
SDL_StartTextInput();
}
draw_tux_text(tool_tux[cur_tool], tool_tips[cur_tool], 1); draw_tux_text(tool_tux[cur_tool], tool_tips[cur_tool], 1);
if (num_font_families > 0) if (num_font_families > 0)
@ -24450,7 +24449,7 @@ static void setup(void)
#ifdef FORKED_FONTS #ifdef FORKED_FONTS
reliable_write(font_socket_fd, &no_system_fonts, sizeof no_system_fonts); reliable_write(font_socket_fd, &no_system_fonts, sizeof no_system_fonts);
#else #else
font_thread = SDL_CreateThread(load_user_fonts_stub, NULL); font_thread = SDL_CreateThread(load_user_fonts_stub, "font_thread", NULL);
#endif #endif
/* continuing on with the rest of the cursors... */ /* continuing on with the rest of the cursors... */