Traktor: Implemented "find in database" when in split mode.

apistol78 · May 22, 2024 · 1c3d761 · 1c3d761
1 parent fc4d018
commit 1c3d761
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 14 deletions.
diff --git a/code/Editor/App/DatabaseView.cpp b/code/Editor/App/DatabaseView.cpp
@@ -583,24 +583,44 @@ void DatabaseView::updateView()
 
 	m_treeDatabase->applyState(treeState);
 	if (viewMode == 1)
-		updateGridInstances();
+		updateGridInstances(nullptr);
 
 	m_splitter->update();
 }
 
 bool DatabaseView::highlight(const db::Instance* instance)
 {
+	const int32_t viewMode = m_toolViewMode->getSelected();
+
 	RefArray< ui::TreeViewItem > items;
 	m_treeDatabase->getItems(items, ui::TreeView::GfDescendants);
-	for (auto item : items)
+
+	if (viewMode == 0)
 	{
-		if (item->getData< db::Instance >(L"INSTANCE") == instance)
+		for (auto item : items)
 		{
-			item->show();
-			item->select();
-			return true;
+			if (item->getData< db::Instance >(L"INSTANCE") == instance)
+			{
+				item->show();
+				item->select();
+				return true;
+			}
+		}
+	}
+	else if (viewMode == 1)
+	{
+		for (auto item : items)
+		{
+			if (item->getData< db::Group >(L"GROUP") == instance->getParent())
+			{
+				item->show();
+				item->select();
+			}
 		}
+		updateGridInstances(instance);
+		return true;
 	}
+
 	return false;
 }
 
@@ -1212,7 +1232,7 @@ Ref< ui::TreeViewItem > DatabaseView::buildTreeItemSplit(ui::TreeView* treeView,
 	return groupItem;
 }
 
-void DatabaseView::updateGridInstances()
+void DatabaseView::updateGridInstances(const db::Instance* highlightInstance)
 {
 	// Grid is only visible in "split" mode.
 	const int32_t viewMode = m_toolViewMode->getSelected();
@@ -1258,6 +1278,10 @@ void DatabaseView::updateGridInstances()
 		item->setSubText(getCategoryText(primaryType));
 		item->setData(L"GROUP", childInstance->getParent());
 		item->setData(L"INSTANCE", childInstance);
+
+		if (highlightInstance)
+			item->setSelected(highlightInstance == childInstance);
+
 		previewItems->add(item);
 
 		// Get thumbnail preview of instance.
@@ -1505,7 +1529,7 @@ void DatabaseView::eventInstanceSelect(ui::SelectionChangeEvent* event)
 	if (m_treeDatabase->getItems(items, ui::TreeView::GfDescendants | ui::TreeView::GfSelectedOnly) <= 0)
 		return;
 
-	updateGridInstances();
+	updateGridInstances(nullptr);
 }
 
 void DatabaseView::eventInstanceButtonDown(ui::MouseButtonDownEvent* event)

diff --git a/code/Editor/App/DatabaseView.h b/code/Editor/App/DatabaseView.h
@@ -118,7 +118,7 @@ class DatabaseView : public ui::Container
 
 	Ref< ui::TreeViewItem > buildTreeItemSplit(ui::TreeView* treeView, ui::TreeViewItem* parentItem, db::Group* group);
 
-	void updateGridInstances();
+	void updateGridInstances(const db::Instance* highlightInstance);
 
 	void filterType(db::Instance* instance);
 

diff --git a/code/Ui/PreviewList/PreviewList.cpp b/code/Ui/PreviewList/PreviewList.cpp
@@ -41,11 +41,7 @@ bool PreviewList::create(Widget* parent, uint32_t style)
 
 void PreviewList::setItems(PreviewItems* items)
 {
-	if ((m_items = items) != nullptr)
-	{
-		for (int32_t i = 0; i < m_items->count(); ++i)
-			m_items->get(i)->setSelected(false);
-	}
+	m_items = items;
 	requestUpdate();
 }