m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show palette in preview (instead of image) when loading palette !

Browse Source
This commit is contained in:
Thomas Bernard 2018-01-23 10:38:55 +01:00
parent abe7a8cb59
commit 207e487d99
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fileformats.c
View File

@ -4666,6 +4666,7 @@ static void Load_PNG_Sub(T_IO_Context * context, FILE * file)
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
case CONTEXT_PREVIEW_PALETTE:
// No pixels to draw in a palette! // No pixels to draw in a palette!
break; break;
} }

2
src/filesel.c
View File

@ -2171,6 +2171,8 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
Init_context_preview(&preview_context, Selector_filename, Selector->Directory); Init_context_preview(&preview_context, Selector_filename, Selector->Directory);
Hide_cursor(); Hide_cursor();
if (context->Type == CONTEXT_PALETTE)
preview_context.Type = CONTEXT_PREVIEW_PALETTE;
Load_image(&preview_context); Load_image(&preview_context);
Destroy_context(&preview_context); Destroy_context(&preview_context);

14
src/loadsave.c
View File

@ -260,6 +260,7 @@ void Set_pixel(T_IO_Context *context, short x_pos, short y_pos, byte color)
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
case CONTEXT_PREVIEW_PALETTE:
break; break;
} }
@ -286,6 +287,7 @@ void Fill_canvas(T_IO_Context *context, byte color)
case CONTEXT_SURFACE: case CONTEXT_SURFACE:
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
case CONTEXT_PREVIEW_PALETTE:
break; break;
} }
} }
@ -329,6 +331,7 @@ void Set_pixel_24b(T_IO_Context *context, short x_pos, short y_pos, byte r, byte
} }
break; break;
case CONTEXT_PREVIEW_PALETTE:
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
// In a palette, there are no pixels! // In a palette, there are no pixels!
break; break;
@ -526,6 +529,7 @@ void Pre_load(T_IO_Context *context, short width, short height, long file_size,
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
case CONTEXT_PREVIEW_PALETTE:
// In a palette, there are no pixels! // In a palette, there are no pixels!
break; break;
} }
@ -562,6 +566,7 @@ void Pre_load(T_IO_Context *context, short width, short height, long file_size,
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
case CONTEXT_PREVIEW_PALETTE:
// In a palette, there are no pixels! // In a palette, there are no pixels!
break; break;
} }
@ -715,6 +720,7 @@ void Load_image(T_IO_Context *context)
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
case CONTEXT_PREVIEW_PALETTE:
// In a palette, there are no pixels! // In a palette, there are no pixels!
break; break;
} }
@ -897,7 +903,7 @@ void Load_image(T_IO_Context *context)
SDL_SetColors(context->Surface, colors, 0, 256); SDL_SetColors(context->Surface, colors, 0, 256);
} }
} }
else if (context->Type == CONTEXT_PREVIEW else if (context->Type == CONTEXT_PREVIEW || context->Type == CONTEXT_PREVIEW_PALETTE
/*&& !context->Buffer_image_24b*/ /*&& !context->Buffer_image_24b*/
/*&& !Get_fileformat(context->Format)->Palette_only*/) /*&& !Get_fileformat(context->Format)->Palette_only*/)
{ {
@ -934,11 +940,12 @@ void Load_image(T_IO_Context *context)
Set_palette(context->Palette); Set_palette(context->Palette);
// Display palette preview // Display palette preview
if (Get_fileformat(context->Format)->Palette_only) // TODO : OU nous somme dans le load du menu palette ! if (Get_fileformat(context->Format)->Palette_only
|| context->Type == CONTEXT_PREVIEW_PALETTE)
{ {
short index; short index;
if (context->Type == CONTEXT_PREVIEW) if (context->Type == CONTEXT_PREVIEW || context->Type == CONTEXT_PREVIEW_PALETTE)
for (index=0; index<256; index++) for (index=0; index<256; index++)
Window_rectangle(183+(index/16)*7,95+(index&15)*5,5,5,index); Window_rectangle(183+(index/16)*7,95+(index&15)*5,5,5,index);
@ -1061,6 +1068,7 @@ void Save_image(T_IO_Context *context)
break; break;
case CONTEXT_PREVIEW: case CONTEXT_PREVIEW:
case CONTEXT_PREVIEW_PALETTE:
break; break;
case CONTEXT_SURFACE: case CONTEXT_SURFACE:

1
src/loadsave.h
View File

@ -34,6 +34,7 @@ enum CONTEXT_TYPE {
CONTEXT_MAIN_IMAGE, CONTEXT_MAIN_IMAGE,
CONTEXT_BRUSH, CONTEXT_BRUSH,
CONTEXT_PREVIEW, CONTEXT_PREVIEW,
CONTEXT_PREVIEW_PALETTE,
CONTEXT_SURFACE, CONTEXT_SURFACE,
CONTEXT_PALETTE CONTEXT_PALETTE
}; };