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

Fix bad offset of brush on startup (recent bug). Files in file selector are now sorted case-insensitive on Windows.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1487 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2010-05-24 21:57:39 +00:00
parent 2ad2574504
commit 0adddf99dc
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/filesel.c
View File

@ -473,6 +473,15 @@ void Read_list_of_drives(T_Fileselector *list)
Recount_files(list); Recount_files(list);
} }
// Comparison of file names:
#ifdef WIN32
// case-insensitive
#define FILENAME_COMPARE strcasecmp
#else
// case-sensitive
#define FILENAME_COMPARE strcmp
#endif
// -- Tri de la liste des fichiers et répertoires --------------------------- // -- Tri de la liste des fichiers et répertoires ---------------------------
void Sort_list_of_files(T_Fileselector *list) void Sort_list_of_files(T_Fileselector *list)
@ -514,7 +523,7 @@ void Sort_list_of_files(T_Fileselector *list)
// Si les deux éléments sont de même type et que le nom du suivant // Si les deux éléments sont de même type et que le nom du suivant
// est plus petit que celui du courant -> need_swap // est plus petit que celui du courant -> need_swap
else if ( (current_item->Type==next_item->Type) && else if ( (current_item->Type==next_item->Type) &&
(strcmp(current_item->Full_name,next_item->Full_name)>0) ) (FILENAME_COMPARE(current_item->Full_name,next_item->Full_name)>0) )
need_swap=1; need_swap=1;

2
src/main.c
View File

@ -643,6 +643,8 @@ int Init_program(int argc,char * argv[])
*Paintbrush_sprite=1; *Paintbrush_sprite=1;
Paintbrush_width=1; Paintbrush_width=1;
Paintbrush_height=1; Paintbrush_height=1;
Paintbrush_offset_X=0;
Paintbrush_offset_Y=0;
Paintbrush_shape=PAINTBRUSH_SHAPE_ROUND; Paintbrush_shape=PAINTBRUSH_SHAPE_ROUND;
// Charger la configuration des touches // Charger la configuration des touches