birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #385 from aws-lumberyard-dev/Atom/guthadam/ATOM-14003

Browse Source 
ATOM-14003 adding image thumbnails to material inspector properties
This commit is contained in:
Guthrie Adams
2021-04-28 12:34:54 -05:00
committed by GitHub
parent bbcc4ffeb1 5cac07b4c1
commit 518c6cb760
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+5 -1
View File
@@ -1304,7 +1304,11 @@ namespace AzToolsFramework
}
else if (attrib == AZ_CRC_CE("Thumbnail"))
{
GUI->SetShowThumbnail(true);
bool showThumbnail = false;
if (attrValue->Read<bool>(showThumbnail))
{
GUI->SetShowThumbnail(showThumbnail);
}
}
else if (attrib == AZ_CRC_CE("ThumbnailCallback"))
{
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ThumbnailPropertyCtrl.cpp
+1
View File
@@ -114,6 +114,7 @@ namespace AzToolsFramework
m_thumbnailEnlarged->move(position);
m_thumbnailEnlarged->setWindowFlags(Qt::Window | Qt::FramelessWindowHint);
m_thumbnailEnlarged->SetThumbnailKey(m_key);
m_thumbnailEnlarged->raise();
m_thumbnailEnlarged->show();
}
QWidget::enterEvent(e);