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

[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.

Browse Source
This commit is contained in:
Chris Galvan
2021-04-29 16:45:39 -05:00
parent 54e06b0f63
commit 217ba1e816
18 changed files with 142 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/ViewportTitleDlg.cpp
+3 -24
View File
@@ -106,29 +106,11 @@ CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
LoadCustomPresets("AspectRatioPresets", "AspectRatioPreset", m_customAspectRatioPresets);
LoadCustomPresets("ResPresets", "ResPreset", m_customResPresets);
const bool newViewportInteractionModelEnabled =
GetIEditor()->IsNewViewportInteractionModelEnabled();
m_ui->m_viewportSearch->setEnabled(!newViewportInteractionModelEnabled);
m_ui->m_viewportSearch->setVisible(!newViewportInteractionModelEnabled);
m_ui->m_viewportSearch->setEnabled(false);
m_ui->m_viewportSearch->setVisible(false);
OnInitDialog();
if (!newViewportInteractionModelEnabled)
{
m_ui->m_viewportSearch->setClearButtonEnabled(true);
connect(m_ui->m_viewportSearch, &AzQtComponents::SearchLineEdit::menuEntryClicked, this, &CViewportTitleDlg::OnViewportSearchButtonClicked);
connect(m_ui->m_viewportSearch, &AzQtComponents::SearchLineEdit::returnPressed, this, &CViewportTitleDlg::OnSearchTermChange);
connect(m_ui->m_viewportSearch, &QLineEdit::textChanged, this, [this] (const QString& text){
if(text.isEmpty())
{
this->OnViewportSearchClear();
}
});
m_ui->m_viewportSearch->setFixedWidth(190);
}
connect(m_ui->m_fovLabel, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpFOVMenu);
connect(m_ui->m_fovStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpFOVMenu);
connect(m_ui->m_ratioStaticCtrl, &QWidget::customContextMenuRequested, this, &CViewportTitleDlg::PopUpAspectMenu);
@@ -257,10 +239,7 @@ void CViewportTitleDlg::SetTitle(const QString& title)
m_title = title;
m_ui->m_titleBtn->setText(m_title);
const bool searchVisible =
title == QLatin1String("Perspective") && !GetIEditor()->IsNewViewportInteractionModelEnabled();
m_ui->m_viewportSearch->setVisible(searchVisible);
m_ui->m_viewportSearch->setVisible(false);
}
//////////////////////////////////////////////////////////////////////////