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

FileSpace selection didn't call op.check sometimes

Browse Source 
(de)select all & globbing didnt run operators check callback.

D867 by @igel with edits
This commit is contained in:
Campbell Barton
2015-02-17 08:52:19 +11:00
parent fa9311c9a4
commit 1e00e87e3a
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/space_file/file_intern.h
View File

@@ -52,6 +52,7 @@ void file_draw_buttons(const bContext *C, ARegion *ar);
void file_calc_previews(const bContext *C, ARegion *ar);
void file_draw_list(const bContext *C, ARegion *ar);
void file_draw_check(bContext *C);
void file_draw_check_cb(bContext *C, void *arg1, void *arg2);
bool file_draw_check_exists(SpaceFile *sfile);

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

@@ -237,7 +237,7 @@ static FileSelect file_select(bContext *C, const rcti *rect, FileSelType select,
}
/* update operator for name change event */
file_draw_check_cb(C, NULL, NULL);
file_draw_check(C);
return retval;
}
@@ -436,6 +436,7 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op))
const FileCheckType check_type = (sfile->params->flag & FILE_DIRSEL_ONLY) ? CHECK_DIRS : CHECK_FILES;
filelist_select(sfile->files, &sel, FILE_SEL_ADD, FILE_SEL_SELECTED, check_type);
}
file_draw_check(C);
ED_area_tag_redraw(sa);
return OPERATOR_FINISHED;
}
@@ -922,7 +923,7 @@ void file_operator_to_sfile(SpaceFile *sfile, wmOperator *op)
/* XXX, files and dirs updates missing, not really so important though */
}
void file_draw_check_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
void file_draw_check(bContext *C)
{
SpaceFile *sfile = CTX_wm_space_file(C);
wmOperator *op = sfile->op;
@@ -942,6 +943,12 @@ void file_draw_check_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
}
}
/* for use with; UI_block_func_set */
void file_draw_check_cb(bContext *C, void *UNUSED(arg1), void *UNUSED(arg2))
{
file_draw_check(C);
}
bool file_draw_check_exists(SpaceFile *sfile)
{
if (sfile->op) { /* fails on reload */
@@ -1519,6 +1526,9 @@ void file_filename_enter_handle(bContext *C, void *UNUSED(arg_unused), void *arg
}
}
}
else if (matches > 1) {
file_draw_check(C);
}
}
}
@@ -1621,7 +1631,7 @@ static int file_filenum_exec(bContext *C, wmOperator *op)
if (sfile->params && (inc != 0)) {
BLI_newname(sfile->params->file, inc);
ED_area_tag_redraw(sa);
file_draw_check_cb(C, NULL, NULL);
file_draw_check(C);
// WM_event_add_notifier(C, NC_WINDOW, NULL);
}

2
source/blender/editors/space_file/filesel.c
View File

@@ -620,7 +620,7 @@ void ED_file_change_dir(bContext *C, const bool checkdir)
folderlist_pushdir(sfile->folders_prev, sfile->params->dir);
file_draw_check_cb(C, NULL, NULL);
file_draw_check(C);
}
}