From 4fac25bd7db955e9bfef9b8de8278fc84afc5327 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kaj=20Gr=C3=B6nholm?= Date: Mon, 26 Feb 2018 16:34:42 +0200 Subject: Use correct icons in mesh selector MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Allows setting custom icon for choosers. Task-number: QT3DS-195 Change-Id: Iec1d7fd3cf6ebcfaabba222609ec90d86069c9ab Reviewed-by: Tomi Korpipää Reviewed-by: Miikka Heikkinen --- src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp') diff --git a/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp b/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp index e1b61bbf..f87dc89b 100644 --- a/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp +++ b/src/Authoring/Studio/Palettes/Inspector/MeshChooserModel.cpp @@ -31,6 +31,7 @@ #include "Doc.h" #include "IDocumentBufferCache.h" #include "StudioApp.h" +#include "BasicObjectsModel.h" MeshChooserModel::MeshChooserModel(QObject *parent) : ChooserModelBase(parent) @@ -52,11 +53,13 @@ const QVector MeshChooserModel::getFixedItems() con static QVector items; if (items.isEmpty()) { - auto primitiveNames = g_StudioApp.GetCore()->GetDoc()->GetBufferCache().GetPrimitiveNames(); - for (auto item = primitiveNames; *item; ++item) { - auto itemName = *item; + auto primitives = BasicObjectsModel::BasicMeshesModel(); + CDoc *doc = g_StudioApp.GetCore()->GetDoc(); + for (int i = 0; i < primitives.size(); i++) { + auto item = primitives.at(i); + const wchar_t *itemName = doc->GetBufferCache().GetPrimitiveName(item.primitiveType()); if (itemName[0] == L'#') - items.append({ OBJTYPE_MODEL, QString::fromWCharArray(itemName + 1) }); + items.append({ OBJTYPE_MODEL, item.icon(), QString::fromWCharArray(itemName + 1) }); } } -- cgit v1.2.3