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 

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sfx.c
View File

@ -625,7 +625,7 @@ static void copyFromClipboard(Sfx* sfx)
{
tic_sound_effect* effect = getEffect(sfx);
if(fromClipboard(effect, sizeof(tic_sound_effect), true))
if(fromClipboard(effect, sizeof(tic_sound_effect), true, false))
history_add(sfx->history.envelope);
}
@ -633,7 +633,7 @@ static void copyWaveFromClipboard(Sfx* sfx)
{
tic_waveform* wave = getWaveform(sfx);
if(fromClipboard(wave, sizeof(tic_waveform), true))
if(fromClipboard(wave, sizeof(tic_waveform), true, false))
history_add(sfx->history.waveform);
}

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;

23
src/studio.c
View File

@ -373,7 +373,24 @@ void str2buf(const char* str, s32 size, void* buf, bool flip)
}
}
bool fromClipboard(void* data, s32 size, bool flip)
void removeWhiteSpaces(char* str)
{
int i = 0;
int len = strlen(str);
for (int j = 0; j < len; j++) {
if (!isspace(str[j])) {
str[i] = str[j];
i++;
}
}
if (i < len - 1) {
str[i] = '\0';
}
}
bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces)
{
if(data)
{
@ -383,6 +400,10 @@ bool fromClipboard(void* data, s32 size, bool flip)
if(clipboard)
{
if (remove_white_spaces)
removeWhiteSpaces(clipboard);
bool valid = strlen(clipboard) == size * 2;
if(valid) str2buf(clipboard, strlen(clipboard), data, flip);

3
src/studio.h
View File

@ -154,8 +154,9 @@ void exitStudio();
u32 unzip(u8** dest, const u8* source, size_t size);
void str2buf(const char* str, s32 size, void* buf, bool flip);
void removeWhiteSpaces(char* str);
void toClipboard(const void* data, s32 size, bool flip);
bool fromClipboard(void* data, s32 size, bool flip);
bool fromClipboard(void* data, s32 size, bool flip, bool remove_white_spaces);
typedef enum
{