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

Don't quit if the user asks for a too big button size, just run with the maximum supported button size.

Browse source
This commit is contained in:
Pere Pujal i Carabantes 2021-04-19 01:15:09 +02:00
parent 8a27286a02
commit fc8310ba03
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tuxpaint.c
View file

@ -763,6 +763,23 @@ static void magic_putpixel(SDL_Surface * surface, int x, int y, Uint32 pixel);
static Uint32 magic_getpixel(SDL_Surface * surface, int x, int y);
static void magic_xorpixel(SDL_Surface * surface, int x, int y);
/**
* Sets button_scale to the maximum Tux Paint can handle
*/
static void set_max_buttonscale(void)
{
float max_w, max_h;
/* WINDOW_WIDTH / original size of tools columnss + 9 buttons + tooloption columns */
max_w = (float)WINDOW_WIDTH / (gd_tools.cols * 48 + 9 * 48 + gd_toolopt.cols * 48);
/* WINDOW_HEIGHT / original size of r_ttools.h + 5 buttons + colors rows + tux area */
max_h = (float)WINDOW_HEIGHT / (40 + 5 * 48 + gd_colors.rows * 48 + 56);
button_scale = min(max_w, max_h);
fprintf(stderr, "Will use a button size of %d\n", (int)(button_scale * ORIGINAL_BUTTON_SIZE));
}
/**
* Sets a variety of screen layout globals, based on the
* size of the window/screen Tux Paint is being displayed on
@ -816,13 +833,15 @@ static void setup_normal_screen_layout(void)
if (buttons_tall < 5) {
fprintf(stderr, "Button size '%d' with window size '%dx%d' is not reasonable (not tall enough).\n",
button_w, WINDOW_WIDTH, WINDOW_HEIGHT);
exit(93);
set_max_buttonscale();
setup_normal_screen_layout();
}
if (r_canvas.w < button_w * 9) {
fprintf(stderr, "Button size '%d' with window size '%dx%d' is not reasonable (not wide enough).\n",
button_w, WINDOW_WIDTH, WINDOW_HEIGHT);
exit(93);
set_max_buttonscale();
setup_normal_screen_layout();
}
gd_tools.rows = buttons_tall;