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

Merge branch 'main' into Prefab/Create/IgnoreLevel

Browse Source
This commit is contained in:
daimini
2021-04-29 11:20:08 -07:00
parent 6271aaa77f 3c5c692148
commit 8f1499581b
2444 changed files with 30912 additions and 34453 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp
+6 -2
View File
@@ -544,7 +544,7 @@ namespace AzToolsFramework
m_errorButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_errorButton->setFixedSize(QSize(16, 16));
m_errorButton->setMouseTracking(true);
m_errorButton->setIcon(QIcon("Editor/Icons/PropertyEditor/error_icon.png"));
m_errorButton->setIcon(QIcon("Icons/PropertyEditor/error_icon.png"));
m_errorButton->setToolTip("Show Errors");
// Insert the error button after the asset label
@@ -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);
Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp
+5 -5
View File
@@ -70,7 +70,7 @@ namespace AzToolsFramework
m_tagLabel->setMinimumSize(24, 22);
m_tagLabel->setAttribute(Qt::WA_TransparentForMouseEvents, true);
QIcon closeIcon("Editor/Icons/animation/close.png");
QIcon closeIcon("Icons/animation/close.png");
QPushButton* button = new QPushButton(this);
button->setStyleSheet(button->styleSheet() + "border: 0px;");
@@ -233,14 +233,14 @@ namespace AzToolsFramework
QPushButton* loadButton = new QPushButton(this);
loadButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
loadButton->setFixedSize(QSize(24, 24));
loadButton->setIcon(QIcon("Editor/UI/Icons/toolbar/libraryLoad.png"));
loadButton->setIcon(QIcon("UI/Icons/toolbar/libraryLoad.png"));
loadButton->setToolTip(tr("Load a saved filter"));
loadButton->setProperty("iconButton", "true");
m_saveButton = new QPushButton(this);
m_saveButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_saveButton->setFixedSize(QSize(24, 24));
m_saveButton->setIcon(QIcon("Editor/UI/Icons/toolbar/librarySave.png"));
m_saveButton->setIcon(QIcon("UI/Icons/toolbar/librarySave.png"));
m_saveButton->setToolTip(tr("Save the current filter"));
m_saveButton->setEnabled(false);
m_saveButton->setProperty("iconButton", "true");
@@ -248,7 +248,7 @@ namespace AzToolsFramework
m_toggleAllFiltersButton = new QPushButton(this);
m_toggleAllFiltersButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_toggleAllFiltersButton->setFixedSize(QSize(24, 24));
m_toggleAllFiltersButton->setIcon(QIcon("Editor/Icons/animation/filter_16.png"));
m_toggleAllFiltersButton->setIcon(QIcon("Icons/animation/filter_16.png"));
m_toggleAllFiltersButton->setVisible(false);
m_toggleAllFiltersButton->setToolTip(tr("Toggle all filters on/off"));
m_toggleAllFiltersButton->setProperty("iconButton", "true");
@@ -267,7 +267,7 @@ namespace AzToolsFramework
m_clearAllButton = new QPushButton(this);
m_clearAllButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
m_clearAllButton->setFixedSize(QSize(24, 24));
m_clearAllButton->setIcon(QIcon("Editor/Icons/animation/close.png"));
m_clearAllButton->setIcon(QIcon("Icons/animation/close.png"));
m_clearAllButton->setVisible(false);
m_clearAllButton->setToolTip(tr("Clear all filters"));
m_clearAllButton->setProperty("iconButton", "true");