feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix material browser's textures search

Browse Source 
Change-Id: Ia0750f0f61d821deeb1d0d3630fb770803e604ee
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2022-11-29 19:35:10 +02:00
parent 916368ede4
commit 5f7d36d1cb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/materialBrowserQmlSource/MaterialBrowser.qml
View File

@@ -194,7 +194,7 @@ Item {
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
font.pixelSize: StudioTheme.Values.baseFontSize font.pixelSize: StudioTheme.Values.baseFontSize
leftPadding: 10 leftPadding: 10
visible: materialBrowserModel.isEmpty && !searchBox.isEmpty() && materialBrowserModel.hasMaterialLibrary visible: materialBrowserModel.isEmpty && !searchBox.isEmpty()
} }
Text { Text {
@@ -277,7 +277,7 @@ Item {
color: StudioTheme.Values.themeTextColor color: StudioTheme.Values.themeTextColor
font.pixelSize: StudioTheme.Values.baseFontSize font.pixelSize: StudioTheme.Values.baseFontSize
leftPadding: 10 leftPadding: 10
visible: materialBrowserModel.isEmpty && !searchBox.isEmpty() && materialBrowserModel.hasMaterialLibrary visible: materialBrowserTexturesModel.isEmpty && !searchBox.isEmpty()
} }
Text { Text {

2
src/plugins/qmldesigner/components/materialbrowser/materialbrowsertexturesmodel.cpp
View File

@@ -54,7 +54,7 @@ bool MaterialBrowserTexturesModel::isTextureVisible(int idx) const
if (!isValidIndex(idx)) if (!isValidIndex(idx))
return false; return false;
return m_searchText.isEmpty() || m_textureList.at(idx).variantProperty("objectName") return m_searchText.isEmpty() || m_textureList.at(idx).variantProperty("source")
.value().toString().contains(m_searchText, Qt::CaseInsensitive); .value().toString().contains(m_searchText, Qt::CaseInsensitive);
} }

1
src/plugins/qmldesigner/components/materialbrowser/materialbrowserwidget.cpp
View File

@@ -300,6 +300,7 @@ void MaterialBrowserWidget::reloadQmlSource()
void MaterialBrowserWidget::updateSearch() void MaterialBrowserWidget::updateSearch()
{ {
m_materialBrowserModel->setSearchText(m_filterText); m_materialBrowserModel->setSearchText(m_filterText);
m_materialBrowserTexturesModel->setSearchText(m_filterText);
m_quickWidget->update(); m_quickWidget->update();
} }