Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-12-06 00:34:49 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-12-06 00:34:49 +0300
commitee120d6293fefec25d762b069d813440f3e54ee5 (patch)
treef6c6728059caf706ca49de1e6341f94cfb61b89f /source/blender/editors/space_file
parent855799ecc1c5e53d9fbfe520fd5402bc0138f674 (diff)
Fix T53476: File Browser: Selection Issue with 'fill' option.
Fill-selection would only go upward in list of items to find an already selected one and fill-select all items in-between. Now, in case upward search fails, it will also intent to go downward, effectiviely allowing to 'fill-select' from bottom to top. Note that top-to-bottom keeps priority (i.e. if a top-to-bottom fill-selection is possible, it will always happen, even if a bottom-to-top one is also possible).
Diffstat (limited to 'source/blender/editors/space_file')
-rw-r--r--source/blender/editors/space_file/file_ops.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index cca33cdd1a7..217ce8f1d9a 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -151,15 +151,25 @@ static FileSelection file_selection_get(bContext *C, const rcti *rect, bool fill
/* if desired, fill the selection up from the last selected file to the current one */
if (fill && (sel.last >= 0) && (sel.last < numfiles) ) {
- int f = sel.last;
- while (f >= 0) {
+ int f;
+ /* Try to find a smaller-index selected item. */
+ for (f = sel.last; f >= 0; f--) {
if (filelist_entry_select_index_get(sfile->files, f, CHECK_ALL) )
break;
- f--;
}
if (f >= 0) {
sel.first = f + 1;
}
+ /* If none found, try to find a higher-index selected item. */
+ else {
+ for (f = sel.first; f < numfiles; f++) {
+ if (filelist_entry_select_index_get(sfile->files, f, CHECK_ALL) )
+ break;
+ }
+ if (f < numfiles) {
+ sel.last = f - 1;
+ }
+ }
}
return sel;
}