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

Making Android compile again, a curly brace displaced and still some problem with labels in Android.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2022-02-19 00:04:00 +01:00
parent 701e033a58
commit 7b53d1583e
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/tuxpaint.c
View file

@ -5306,7 +5306,6 @@ static void mainloop(void)
} }
button_down = 1; button_down = 1;
} }
}
else if (HIT(r_sfx) && valid_click(event.button.button)) else if (HIT(r_sfx) && valid_click(event.button.button))
{ {
/* A sound player button on the lower left has been pressed! */ /* A sound player button on the lower left has been pressed! */
@ -5337,7 +5336,7 @@ static void mainloop(void)
start_motion_convert(event); start_motion_convert(event);
#endif #endif
}
else if (event.type == SDL_MOUSEWHEEL && wheely) else if (event.type == SDL_MOUSEWHEEL && wheely)
{ {
int most = 14; int most = 14;
@ -15420,12 +15419,7 @@ static void do_png_embed_data(png_structp png_ptr)
tmpstr[nbtmpstr] = '\0'; tmpstr[nbtmpstr] = '\0';
fprintf(lfi, "%s", tmpstr); fprintf(lfi, "%s", tmpstr);
#elif defined(__ANDROID__) #elif defined(__ANDROID__)
fprintf(lfi, "%u\n", current_node->save_texttool_len);
for (i = 0; i < current_node->save_texttool_len; i++)
{
fprintf(lfi, "%d ", (int)current_node->save_texttool_str[i]); fprintf(lfi, "%d ", (int)current_node->save_texttool_str[i]);
}
#else #else
fprintf(lfi, "%lc", (wint_t) current_node->save_texttool_str[i]); fprintf(lfi, "%lc", (wint_t) current_node->save_texttool_str[i]);
#endif #endif
@ -29335,7 +29329,7 @@ static void apply_label_node(int old_x, int old_y) {
* is in top half of canvas, put keyboard on bottom & vice-versa * is in top half of canvas, put keyboard on bottom & vice-versa
*/ */
static void reposition_onscreen_keyboard(int y) { static void reposition_onscreen_keyboard(int y) {
if (onscreen_keyboard) if (onscreen_keyboard && kbd)
{ {
kbd_rect.x = button_w * 2 + (canvas->w - kbd->surface->w) / 2; kbd_rect.x = button_w * 2 + (canvas->w - kbd->surface->w) / 2;