Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#32564] Entries in recent list (file select dialog) don't get pushed to top if used again

Browse Source
This commit is contained in:
Campbell Barton
2012-09-17 02:19:41 +00:00
parent a5003727c5
commit 3cae9ca043
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_file/file_ops.c
View File

@@ -770,8 +770,9 @@ int file_exec(bContext *C, wmOperator *exec_op)
file_sfile_to_operator(op, sfile, filepath); file_sfile_to_operator(op, sfile, filepath);
if (BLI_exists(sfile->params->dir)) if (BLI_exists(sfile->params->dir)) {
fsmenu_insert_entry(fsmenu_get(), FS_CATEGORY_RECENT, sfile->params->dir, FS_INSERT_SAVE); fsmenu_insert_entry(fsmenu_get(), FS_CATEGORY_RECENT, sfile->params->dir, FS_INSERT_SAVE | FS_INSERT_FIRST);
}
BLI_make_file_string(G.main->name, filepath, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE); BLI_make_file_string(G.main->name, filepath, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_BOOKMARK_FILE);
fsmenu_write_file(fsmenu_get(), filepath); fsmenu_write_file(fsmenu_get(), filepath);

10
source/blender/editors/space_file/fsmenu.c
View File

@@ -164,14 +164,22 @@ void fsmenu_insert_entry(struct FSMenu *fsmenu, FSMenuCategory category, const c
FSMenuEntry *prev; FSMenuEntry *prev;
FSMenuEntry *fsme; FSMenuEntry *fsme;
FSMenuEntry *fsms; FSMenuEntry *fsms;
FSMenuEntry *fsms_first;
fsms = fsmenu_get_category(fsmenu, category); fsms = fsmenu_get_category(fsmenu, category);
prev = fsme = fsms; prev = fsme = fsms_first = fsms;
for (; fsme; prev = fsme, fsme = fsme->next) { for (; fsme; prev = fsme, fsme = fsme->next) {
if (fsme->path) { if (fsme->path) {
const int cmp_ret = BLI_path_cmp(path, fsme->path); const int cmp_ret = BLI_path_cmp(path, fsme->path);
if (cmp_ret == 0) { if (cmp_ret == 0) {
if (FS_INSERT_FIRST) {
if (fsme != fsms_first) {
prev->next = fsme->next;
fsme->next = fsms_first;
fsmenu_set_category(fsmenu, category, fsme);
}
}
return; return;
} }
else if ((flag & FS_INSERT_SORTED) && cmp_ret < 0) { else if ((flag & FS_INSERT_SORTED) && cmp_ret < 0) {

3
source/blender/editors/space_file/fsmenu.h
View File

@@ -45,7 +45,8 @@ typedef enum FSMenuCategory {
typedef enum FSMenuInsert { typedef enum FSMenuInsert {
FS_INSERT_SORTED = (1 << 0), FS_INSERT_SORTED = (1 << 0),
FS_INSERT_SAVE = (1 << 1) FS_INSERT_SAVE = (1 << 1),
FS_INSERT_FIRST = (1 << 2) /* moves the item to the front of the list when its already there */
} FSMenuInsert; } FSMenuInsert;
struct FSMenu; struct FSMenu;