diff options
| author | Julian Eisel <julian@blender.org> | 2021-06-28 20:41:28 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2021-06-28 20:47:13 +0300 |
| commit | c0fb8375f664235d306bb6f99c0322579887d8e8 (patch) | |
| tree | 3450a486136919a4da07ccc6b47ef53fec54b1f5 /source/blender/editors/interface/interface_query.c | |
| parent | 578ccdf75bb48f2e5a74def345a8ced437665d1f (diff) | |
Fix T89515: Clicking on Favorites in File Browser will rename them
Likely uncovered by 6c97c7f767c9, the actual mistake would be from
6942dd9f4900.
The hacks to display text buttons for renaming in UI-Lists used the emboss of
the text button for handling logic. It relied on the emboss `NONE` but we also
introduced `NONE_OR_STATUS` with 6942dd9f4900. Both values need to be treated
equally for the logic of this hack to work.
The change in `interface_layout.c` is actually not needed for this exact issue,
but it's the correct thing to do. There may actually be more cases where `NONE`
and `NONE_OR_STATUS` need to be treated equally. Something to be checked still.
Diffstat (limited to 'source/blender/editors/interface/interface_query.c')
| -rw-r--r-- | source/blender/editors/interface/interface_query.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_query.c b/source/blender/editors/interface/interface_query.c index 95218e2e7e3..7d561aa1c71 100644 --- a/source/blender/editors/interface/interface_query.c +++ b/source/blender/editors/interface/interface_query.c @@ -91,7 +91,8 @@ bool ui_but_is_interactive(const uiBut *but, const bool labeledit) if (but->flag & UI_SCROLLED) { return false; } - if ((but->type == UI_BTYPE_TEXT) && (but->emboss == UI_EMBOSS_NONE) && !labeledit) { + if ((but->type == UI_BTYPE_TEXT) && + (ELEM(but->emboss, UI_EMBOSS_NONE, UI_EMBOSS_NONE_OR_STATUS)) && !labeledit) { return false; } if ((but->type == UI_BTYPE_LISTROW) && labeledit) { |