diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-22 04:35:38 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 20:49:01 +0400 |
commit | 77719bfd0669cc675ad729f4c51672173842faca (patch) | |
tree | af0882068e0a90dacf10f19fef4380a8d8c91af4 /source/blender/editors/space_file/file_intern.h | |
parent | 6a6c7b10de85c2ed01ca68f95d6c70f81522f3d3 (diff) |
File Browser: autocomplete keeps focus in the file field when entering a folder.
There is a bunch of internal refactoring going on too:
* No longer use operators to handle these directory and file fields, only makes
things more complicated than they should be.
* Handle autocomplete partial/full match deeper in the UI code
* Directory field still does not keep focus, that's for another time to fix,
you can already do pretty quick keyboard only navigation with the file field.
Reviewed By: elubie
Differential Revision: http://developer.blender.org/D29
Diffstat (limited to 'source/blender/editors/space_file/file_intern.h')
-rw-r--r-- | source/blender/editors/space_file/file_intern.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/editors/space_file/file_intern.h b/source/blender/editors/space_file/file_intern.h index 134fe0ac6bc..841cb0d5f77 100644 --- a/source/blender/editors/space_file/file_intern.h +++ b/source/blender/editors/space_file/file_intern.h @@ -72,8 +72,6 @@ void FILE_OT_execute(struct wmOperatorType *ot); void FILE_OT_cancel(struct wmOperatorType *ot); void FILE_OT_parent(struct wmOperatorType *ot); void FILE_OT_directory_new(struct wmOperatorType *ot); -void FILE_OT_directory(struct wmOperatorType *ot); -void FILE_OT_filename(struct wmOperatorType *ot); void FILE_OT_previous(struct wmOperatorType *ot); void FILE_OT_next(struct wmOperatorType *ot); void FILE_OT_refresh(struct wmOperatorType *ot); @@ -88,11 +86,12 @@ int file_cancel_exec(bContext *C, struct wmOperator *unused); int file_parent_exec(bContext *C, struct wmOperator *unused); int file_previous_exec(bContext *C, struct wmOperator *unused); int file_next_exec(bContext *C, struct wmOperator *unused); -int file_filename_exec(bContext *C, struct wmOperator *unused); -int file_directory_exec(bContext *C, struct wmOperator *unused); int file_directory_new_exec(bContext *C, struct wmOperator *unused); int file_delete_exec(bContext *C, struct wmOperator *unused); +void file_directory_enter_handle(bContext *C, void *arg_unused, void *arg_but); +void file_filename_enter_handle(bContext *C, void *arg_unused, void *arg_but); + int file_highlight_set(struct SpaceFile *sfile, struct ARegion *ar, int mx, int my); void file_sfile_to_operator(struct wmOperator *op, struct SpaceFile *sfile, char *filepath); @@ -106,8 +105,8 @@ float file_string_width(const char *str); float file_font_pointsize(void); void file_change_dir(bContext *C, int checkdir); int file_select_match(struct SpaceFile *sfile, const char *pattern, char *matched_file); -bool autocomplete_directory(struct bContext *C, char *str, void *arg_v); -bool autocomplete_file(struct bContext *C, char *str, void *arg_v); +int autocomplete_directory(struct bContext *C, char *str, void *arg_v); +int autocomplete_file(struct bContext *C, char *str, void *arg_v); /* file_panels.c */ void file_panels_register(struct ARegionType *art); |