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

Get brush selector down-scroll to grok brush spacing

Browse source
This commit is contained in:
Bill Kendrick 2022-01-19 01:46:44 -08:00
parent 0b18aac985
commit 145c35a95d
1 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/tuxpaint.c
View file

@ -3667,6 +3667,15 @@ static void mainloop(void)
} }
} }
else if (cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES)
{
if (!disable_brushspacing)
{
gd_controls.rows = 1;
gd_controls.cols = 2;
}
}
/* number of whole or partial rows that will be needed /* number of whole or partial rows that will be needed
(can make this per-tool if variable columns needed) */ (can make this per-tool if variable columns needed) */
num_rows_needed = (num_things + gd_items.cols - 1) / gd_items.cols; num_rows_needed = (num_things + gd_items.cols - 1) / gd_items.cols;
@ -5061,6 +5070,14 @@ static void mainloop(void)
gd_controls.cols = 2; gd_controls.cols = 2;
} }
} }
else if (cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES)
{
if (!disable_brushspacing)
{
gd_controls.rows = 1;
gd_controls.cols = 2;
}
}
/* number of whole or partial rows that will be needed /* number of whole or partial rows that will be needed
(can make this per-tool if variable columns needed) */ (can make this per-tool if variable columns needed) */
@ -5504,6 +5521,7 @@ static void mainloop(void)
{ {
} }
/* This if/if/if block is awful -bjk 2022.01.19 */
int control_rows = 0; 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;
@ -5524,6 +5542,9 @@ static void mainloop(void)
} }
if (cur_tool == TOOL_SHAPES && !disable_shape_controls) if (cur_tool == TOOL_SHAPES && !disable_shape_controls)
control_rows = 1; control_rows = 1;
if ((cur_tool == TOOL_BRUSH || cur_tool == TOOL_LINES) && !disable_brushspacing)
control_rows = 1;
int num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols; int num_places = buttons_tall * gd_toolopt.cols - control_rows * gd_toolopt.cols;
if (num_things > num_places) if (num_things > num_places)