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

Prefab Focus Mode | Fixes to viewport top toolbar (#7094)

Browse Source 
* Fixes to the viewport top toolbar.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Additional checks to prevent issues if widgets aren't set up correctly.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Add asserts to catch UI changes that would break this class.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
This commit is contained in:
Danilo Aimini
2022-01-24 13:17:16 -08:00
committed by GitHub
parent 630c10faf8
commit d1143770e0
6 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/ViewPane.cpp
+17 -20
View File
@@ -87,29 +87,15 @@ public:
}
// Handle labels with submenus
if (auto toolLabel = qobject_cast<QLabel*>(toolWidget))
if (auto toolLabel = qobject_cast<QToolButton*>(toolWidget))
{
if (!toolLabel->isVisible())
{
// Manually turn the custom context menus into submenus
if (toolLabel->objectName() == "m_fovStaticCtrl")
if (toolLabel->menu())
{
QAction* newAction = menu->addMenu(m_viewportDlg->GetFovMenu());
newAction->setText(QString("FOV: %1").arg(toolLabel->text()));
}
else if (toolLabel->objectName() == "m_ratioStaticCtrl")
{
QAction* newAction = menu->addMenu(m_viewportDlg->GetAspectMenu());
newAction->setText(QString("Ratio: %1").arg(toolLabel->text()));
}
else if (toolLabel->objectName() == "m_sizeStaticCtrl")
{
QAction* newAction = menu->addMenu(m_viewportDlg->GetResolutionMenu());
newAction->setText(QString("%1").arg(toolLabel->text()));
}
else
{
// Don't add actions for other Labels
QAction* action = menu->addMenu(toolLabel->menu());
action->setText(toolLabel->text());
continue;
}
}
@@ -179,14 +165,25 @@ CLayoutViewPane::CLayoutViewPane(QWidget* parent)
toolbar->installEventFilter(&m_viewportTitleDlg);
toolbar->setContextMenuPolicy(Qt::CustomContextMenu);
connect(toolbar, &QWidget::customContextMenuRequested, &m_viewportTitleDlg, &QWidget::customContextMenuRequested);
setContextMenuPolicy(Qt::NoContextMenu);
if (QToolButton* expansion = AzQtComponents::ToolBar::getToolBarExpansionButton(toolbar))
{
expansion->installEventFilter(m_expanderWatcher);
}
AzQtComponents::BreadCrumbs* prefabsBreadcrumbs =
qobject_cast<AzQtComponents::BreadCrumbs*>(toolbar->findChild<QWidget*>("m_prefabFocusPath"));
QToolButton* backButton = qobject_cast<QToolButton*>(toolbar->findChild<QWidget*>("m_prefabFocusBackButton"));
AZ_Assert(prefabsBreadcrumbs, "Could not find Prefabs Breadcrumbs widget on CLayoutViewPane initialization!");
AZ_Assert(backButton, "Could not find Prefabs Breadcrumbs back button on CLayoutViewPane initialization!");
if (prefabsBreadcrumbs && backButton)
{
m_viewportTitleDlg.InitializePrefabViewportFocusPathHandler(prefabsBreadcrumbs, backButton);
}
m_id = -1;
}