griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Asset shelf missing deactivation if new item hidden

Browse Source 
When a new item is active, other items are only deactivated in the
`set_state_active` method. This doesn't run if the new item is not
displayed by the shelf for whatever reason (e.g. catalog filters).
To fix this, just set the item inactive. This may be redundant with
the deactivation in `set_state_active`, or it might not be, depending
on whether the active item is visible.

Pull Request: https://projects.blender.org/blender/blender/pulls/121589
This commit is contained in:
Hans Goudey
2024-05-14 05:11:07 +02:00
committed by Hans Goudey
parent 1589f3713a
commit ac7ceba950
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/interface/views/abstract_view_item.cc
View File

@@ -86,11 +86,15 @@ void AbstractViewItem::deactivate()
void AbstractViewItem::change_state_delayed()
{
const std::optional<bool> should_be_active = this->should_be_active();
if (should_be_active.has_value() && *should_be_active) {
/* Don't call #activate() here, since this reflects an external state change and therefore
* shouldn't call #on_activate(). */
set_state_active();
if (const std::optional<bool> should_be_active = this->should_be_active()) {
if (*should_be_active) {
/* Don't call #activate() here, since this reflects an external state change and therefore
* shouldn't call #on_activate(). */
set_state_active();
}
else {
is_active_ = false;
}
}
}