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

tuxpaint.c: replace some tabs with spaces

Browse source
This commit is contained in:
Bill Kendrick 2022-03-16 00:38:37 -07:00
parent 491862d2da
commit 8aeb022849
1 changed files with 59 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tuxpaint.c
View file

@ -5667,6 +5667,8 @@ static void mainloop(void)
} }
else if (HIT(r_toolopt)) else if (HIT(r_toolopt))
{ {
int control_rows = 0, num_places;
/* mouse cursor code /* mouse cursor code
WARNING: this must be kept in sync with the mouse-click WARNING: this must be kept in sync with the mouse-click
and mouse-click code. (it isn't, currently!) */ and mouse-click code. (it isn't, currently!) */
@ -5681,9 +5683,9 @@ static void mainloop(void)
} }
/* This if/if/if block is awful -bjk 2022.01.19 */ /* This if/if/if block is awful -bjk 2022.01.19 */
int control_rows = 0;
if (cur_tool == TOOL_STAMP && !disable_stamp_controls) if (cur_tool == TOOL_STAMP && !disable_stamp_controls)
control_rows = 3; control_rows = 3;
if (cur_tool == TOOL_LABEL) if (cur_tool == TOOL_LABEL)
{ {
control_rows = 1; control_rows = 1;
@ -5704,7 +5706,7 @@ static void mainloop(void)
if ((cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) && !disable_brushspacing) if ((cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) && !disable_brushspacing)
control_rows = 1; control_rows = 1;
int num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols; num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols;
if (num_things > num_places) if (num_things > num_places)
{ {
@ -9553,9 +9555,6 @@ static void draw_fonts(void)
dest.x = WINDOW_WIDTH - r_ttoolopt.w; dest.x = WINDOW_WIDTH - r_ttoolopt.w;
dest.y = r_ttoolopt.h + off_y + (((most - gd_toolopt.cols) / gd_toolopt.cols + TOOLOFFSET / gd_toolopt.cols) * button_h); dest.y = r_ttoolopt.h + off_y + (((most - gd_toolopt.cols) / gd_toolopt.cols + TOOLOFFSET / gd_toolopt.cols) * button_h);
/* if (!disable_stamp_controls)
dest.y = dest.y - (button_h * 2); */
if (font_scroll < num_font_families - (most - gd_toolopt.cols) - TOOLOFFSET) if (font_scroll < num_font_families - (most - gd_toolopt.cols) - TOOLOFFSET)
{ {
SDL_BlitSurface(img_scroll_down, NULL, screen, &dest); SDL_BlitSurface(img_scroll_down, NULL, screen, &dest);
@ -13356,10 +13355,8 @@ static int do_prompt_image_flash_snd(const char *const text,
SDL_Delay(1); SDL_Delay(1);
if (w == r_ttools.w - 2) if (w == r_ttools.w - 2)
{
SDL_BlitSurface(backup, NULL, screen, NULL); SDL_BlitSurface(backup, NULL, screen, NULL);
} }
}
SDL_FreeSurface(backup); SDL_FreeSurface(backup);