4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Don't reselect SceneTree items if tree is clearing

Browse source 
In the scene tree, we currently prevent deselecting items by
automatically reselecting a new one to workaround a regression in Qt 6.2
that would let users unselect items even in SingleSelection QItemViews.
When clearing however, we explicitly want to unselect the currently
selected item, so we should avoid reselecting it in the SceneTree.
This commit is contained in:
gxalpha 2022-09-30 14:05:06 +02:00 • committed by Jim
commit dc30cf0843
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
UI/item-widget-helpers.cpp
View file

@ -37,10 +37,14 @@ void DeleteListItem(QListWidget *widget, QListWidgetItem *item)
void ClearListItems(QListWidget *widget)
{
// Workaround for the SceneTree workaround for QTBUG-105870
widget->setProperty("clearing", true);
widget->setCurrentItem(nullptr, QItemSelectionModel::Clear);
for (int i = 0; i < widget->count(); i++)
delete widget->itemWidget(widget->item(i));
widget->clear();
widget->setProperty("clearing", false);
}

3
UI/scene-tree.cpp
View file

@ -252,6 +252,7 @@ void SceneTree::rowsInserted(const QModelIndex &parent, int start, int end)
void SceneTree::selectionChanged(const QItemSelection &selected,
const QItemSelection &deselected)
{
if (selected.count() == 0 && deselected.count() > 0)
if (selected.count() == 0 && deselected.count() > 0 &&
!property("clearing").toBool())
setCurrentRow(deselected.indexes().front().row());
}