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

simplification of in Load_picture()

Browse Source
This commit is contained in:
Thomas Bernard 2018-01-23 10:09:49 +01:00
parent 76f3860712
commit abe7a8cb59
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/buttons.c
View File

@ -3113,6 +3113,7 @@ void Load_picture(enum CONTEXT_TYPE type)
T_IO_Context context; T_IO_Context context;
static char filename [MAX_PATH_CHARACTERS]; static char filename [MAX_PATH_CHARACTERS];
static char directory[MAX_PATH_CHARACTERS]; static char directory[MAX_PATH_CHARACTERS];
T_Selector_settings * selector;
switch (type) switch (type)
{ {
@ -3120,11 +3121,13 @@ void Load_picture(enum CONTEXT_TYPE type)
strcpy(filename, Main.backups->Pages->Filename); strcpy(filename, Main.backups->Pages->Filename);
strcpy(directory, Main.backups->Pages->File_directory); strcpy(directory, Main.backups->Pages->File_directory);
Init_context_layered_image(&context, filename, directory); Init_context_layered_image(&context, filename, directory);
selector = &Main.selector;
break; break;
case CONTEXT_BRUSH: case CONTEXT_BRUSH:
strcpy(filename, Brush_filename); strcpy(filename, Brush_filename);
strcpy(directory, Brush_file_directory); strcpy(directory, Brush_file_directory);
Init_context_brush(&context, filename, directory); Init_context_brush(&context, filename, directory);
selector = &Brush_selector;
break; break;
case CONTEXT_PALETTE: case CONTEXT_PALETTE:
strcpy(filename, ""); strcpy(filename, "");
@ -3132,11 +3135,12 @@ void Load_picture(enum CONTEXT_TYPE type)
Init_context_layered_image(&context, filename, directory); Init_context_layered_image(&context, filename, directory);
context.Type = CONTEXT_PALETTE; context.Type = CONTEXT_PALETTE;
context.Format = FORMAT_PAL; context.Format = FORMAT_PAL;
selector = &Main.selector;
break; break;
default: default:
return; // DO NOTHING return; // DO NOTHING
} }
confirm=Button_Load_or_Save((type==CONTEXT_MAIN_IMAGE)?&Main.selector:&Brush_selector, 1, &context); confirm=Button_Load_or_Save(selector, 1, &context);
if (confirm) if (confirm)
{ {