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

Mend drop-shadows on prompts

Browse source 
...they were not rendering the way we were doing it in the sdl2.0
branch.
This commit is contained in:
Bill Kendrick 2022-09-05 00:04:52 -07:00
parent 53c1c5e995
commit 270f5353e0
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2022.September.4 (0.9.29) 2022.September.5 (0.9.29)
* Improvements to "Stamp" tool: * Improvements to "Stamp" tool:
----------------------------- -----------------------------
* WIP - Stamps may now be rotated. * WIP - Stamps may now be rotated.
@ -23,6 +23,9 @@ http://www.tuxpaint.org/
which seemed to work fine under SDL1.2, but does not under SDL2.) which seemed to work fine under SDL1.2, but does not under SDL2.)
Closes https://sourceforge.net/p/tuxpaint/bugs/259/ Closes https://sourceforge.net/p/tuxpaint/bugs/259/
* Mended issue that prevented pop-up prompt's drop-shadows
from rendering (under SDL2).
* Opening and immediately dismissing Color Mixer could cause * Opening and immediately dismissing Color Mixer could cause
an unexpected color to be chosen. an unexpected color to be chosen.
h/t @kentonyanamin on Twitter for reporting. h/t @kentonyanamin on Twitter for reporting.

21
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - September 2, 2022 June 14, 2002 - September 5, 2022
*/ */
#include "platform.h" #include "platform.h"
@ -13947,10 +13947,7 @@ static int do_prompt_image_flash_snd(const char *const text,
if (alpha_surf != NULL) if (alpha_surf != NULL)
{ {
SDL_FillRect(alpha_surf, NULL, SDL_MapRGBA(alpha_surf->format, 0, 0, 0, 64));
SDL_FillRect(alpha_surf, NULL, SDL_MapRGB(alpha_surf->format, 0, 0, 0));
SDL_SetSurfaceAlphaMod(alpha_surf, 64);
for (i = 8; i > 0; i = i - 2) for (i = 8; i > 0; i = i - 2)
{ {
@ -22453,6 +22450,9 @@ static Uint8 magic_touched(int x, int y)
* Allow the user to select a color from one of the * Allow the user to select a color from one of the
* pixels within their picture. * pixels within their picture.
* *
* A small dialog will appear over the color palette
* at the bottom of the screen.
*
* @param boolean temp_mode - whether to only appear * @param boolean temp_mode - whether to only appear
* while a shortcut key is being held * while a shortcut key is being held
* (if not, the mouse will be positioned at the bottom * (if not, the mouse will be positioned at the bottom
@ -22564,8 +22564,7 @@ static int do_color_sel(int temp_mode)
if (alpha_surf != NULL) if (alpha_surf != NULL)
{ {
SDL_FillRect(alpha_surf, NULL, SDL_MapRGB(alpha_surf->format, 0, 0, 0)); SDL_FillRect(alpha_surf, NULL, SDL_MapRGBA(alpha_surf->format, 0, 0, 0, 64));
SDL_SetSurfaceAlphaMod(alpha_surf, 64);
for (i = 8; i > 0; i = i - 2) for (i = 8; i > 0; i = i - 2)
{ {
@ -22929,9 +22928,7 @@ static int do_color_picker(void)
if (alpha_surf != NULL) if (alpha_surf != NULL)
{ {
SDL_FillRect(alpha_surf, NULL, SDL_MapRGB(alpha_surf->format, 0, 0, 0)); SDL_FillRect(alpha_surf, NULL, SDL_MapRGBA(alpha_surf->format, 0, 0, 0, 64));
SDL_SetSurfaceAlphaMod(alpha_surf, 64);
for (i = 8; i > 0; i = i - 2) for (i = 8; i > 0; i = i - 2)
{ {
@ -23655,8 +23652,7 @@ static int do_color_mix(void)
if (alpha_surf != NULL) if (alpha_surf != NULL)
{ {
SDL_FillRect(alpha_surf, NULL, SDL_MapRGB(alpha_surf->format, 0, 0, 0)); SDL_FillRect(alpha_surf, NULL, SDL_MapRGBA(alpha_surf->format, 0, 0, 0, 64));
SDL_SetSurfaceAlphaMod(alpha_surf, 64);
for (i = 8; i > 0; i = i - 2) for (i = 8; i > 0; i = i - 2)
{ {
@ -23668,6 +23664,7 @@ static int do_color_mix(void)
SDL_BlitSurface(alpha_surf, NULL, screen, &dest); SDL_BlitSurface(alpha_surf, NULL, screen, &dest);
} }
SDL_FreeSurface(alpha_surf); SDL_FreeSurface(alpha_surf);
} }
#endif #endif