archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

The filesel common-path menu didn't work properly when

Browse Source 
there were consecutive separators, fixed.
This commit is contained in:
Daniel Dunbar
2003-03-25 17:43:08 +00:00
parent cdb2974b67
commit 7c5d4a12d1
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/blender/src/filesel.c
View File

@@ -149,7 +149,7 @@ struct _FSMenuEntry {
char *path; char *path;
}; };
static FSMenuEntry *fsmenu= 0, *lseperator= 0; static FSMenuEntry *fsmenu= 0;
int fsmenu_get_nentries(void) int fsmenu_get_nentries(void)
{ {
@@ -187,9 +187,16 @@ char *fsmenu_build_menu(void)
for (fsme= fsmenu; fsme; fsme= fsme->next) { for (fsme= fsmenu; fsme; fsme= fsme->next) {
if (!fsme->path) { if (!fsme->path) {
/* ignore consecutive or trailing seperators */ /* clean consecutive seperators and ignore trailing ones */
if (fsme->next && fsme->next->path) if (fsme->next) {
BLI_dynstr_append(ds, "%l|"); if (fsme->next->path) {
BLI_dynstr_append(ds, "%l|");
} else {
FSMenuEntry *next= fsme->next;
fsme->next= next->next;
MEM_freeN(next);
}
}
} else { } else {
BLI_dynstr_append(ds, fsme->path); BLI_dynstr_append(ds, fsme->path);
if (fsme->next) BLI_dynstr_append(ds, "|"); if (fsme->next) BLI_dynstr_append(ds, "|");
@@ -200,17 +207,21 @@ char *fsmenu_build_menu(void)
BLI_dynstr_free(ds); BLI_dynstr_free(ds);
return menustr; return menustr;
} }
static FSMenuEntry *fsmenu_get_last_separator(void)
{
FSMenuEntry *fsme, *lsep=NULL;
for (fsme= fsmenu; fsme; fsme= fsme->next)
if (!fsme->path)
lsep= fsme;
return lsep;
}
void fsmenu_insert_entry(char *path, int sorted) void fsmenu_insert_entry(char *path, int sorted)
{ {
FSMenuEntry *fsme, *prev; FSMenuEntry *prev= fsmenu_get_last_separator();
FSMenuEntry *fsme= prev?prev->next:fsmenu;
if (lseperator) {
prev= lseperator;
fsme= lseperator->next;
} else {
prev= NULL;
fsme= fsmenu;
}
for (; fsme; prev= fsme, fsme= fsme->next) { for (; fsme; prev= fsme, fsme= fsme->next) {
if (fsme->path) { if (fsme->path) {
if (BLI_streq(path, fsme->path)) { if (BLI_streq(path, fsme->path)) {
@@ -239,11 +250,9 @@ void fsmenu_append_seperator(void)
while (fsme->next) fsme= fsme->next; while (fsme->next) fsme= fsme->next;
lseperator= MEM_mallocN(sizeof(*fsme), "fsme"); fsme->next= MEM_mallocN(sizeof(*fsme), "fsme");
lseperator->next= NULL; fsme->next->next= NULL;
lseperator->path= NULL; fsme->next->path= NULL;
fsme->next= lseperator;
} }
} }
void fsmenu_remove_entry(int idx) void fsmenu_remove_entry(int idx)