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:
authorJulian Eisel <julian@blender.org>2020-08-05 22:52:45 +0300
committerJulian Eisel <julian@blender.org>2020-08-05 22:57:51 +0300
commit315ae005c3e99541e7440ff57a2f624bf0461d6a (patch)
treed95e101a524cecf1bab461f27dc056f95b8e9c4f
parentc606044157a3a618938d439f527377366624cbaa (diff)
Fix file name sometimes not visible immediately after renaming
Steps to reproduce were: * Open File Browser * Create a new directory * Cancel renaming with Esc File selection flags were modified during drawing when the rename button got removed, but the file name label drawing wasn't checking the modified state.
-rw-r--r--source/blender/editors/space_file/file_draw.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c
index 8d14664c0fa..5150f6bed69 100644
--- a/source/blender/editors/space_file/file_draw.c
+++ b/source/blender/editors/space_file/file_draw.c
@@ -876,7 +876,9 @@ void file_draw_list(const bContext *C, ARegion *region)
sfile->files, file, FILE_SEL_REMOVE, FILE_SEL_EDITING, CHECK_ALL);
}
}
- else {
+
+ /* file_selflag might have been modified by branch above. */
+ if ((file_selflag & FILE_SEL_EDITING) == 0) {
const int txpos = (params->display == FILE_IMGDISPLAY) ? sx : sx + 1 + icon_ofs;
const int typos = (params->display == FILE_IMGDISPLAY) ?
sy - layout->tile_h + layout->textheight :