dan/TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #456 from frenetic/remove_whitespaces_when_pasting_palette

Browse Source 
Remove whitespaces when pasting a new palette
This commit is contained in:
Vadim Grigoruk
2017-12-11 12:49:11 +03:00
committed by GitHub
parent 9fd5484acc 67e6dc281f
commit 4d1685bfe7
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sprite.c
View File

@@ -648,8 +648,8 @@ static void drawRGBSlider(Sprite* sprite, s32 x, s32 y, u8* value)
static void pasteColor(Sprite* sprite)
{
fromClipboard(sprite->tic->cart.palette.data, sizeof(tic_palette), false);
fromClipboard(&sprite->tic->cart.palette.colors[sprite->color], sizeof(tic_rgb), false);
fromClipboard(sprite->tic->cart.palette.data, sizeof(tic_palette), false, true);
fromClipboard(&sprite->tic->cart.palette.colors[sprite->color], sizeof(tic_rgb), false, true);
}
static void drawRGBTools(Sprite* sprite, s32 x, s32 y)
@@ -1240,7 +1240,7 @@ static void copyFromClipboard(Sprite* sprite)
if(buffer)
{
if(fromClipboard(buffer, size, true))
if(fromClipboard(buffer, size, true, false))
{
SDL_Rect rect = getSpriteRect(sprite);
s32 r = rect.x + rect.w;