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

Main toolbar consolidation and cleanup (#1167)

Browse Source 
* Moving menu options around

* Consolidation and moving of toolbar functioanlity

* Fixed non-unity build missing header

* Updated camera icon to the correct one

* Addressed review feedback

* Addressed review feedback

* Moved icons to new folder structure/naming
This commit is contained in:
Terry Michaels
2021-06-07 18:11:56 -05:00
committed by GitHub
parent 36cb0f6d40
commit 593b679fa3
17 changed files with 597 additions and 1322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/MainWindow.cpp
-98
View File
@@ -297,68 +297,6 @@ namespace
}
}
class SnapToWidget
: public QWidget
{
public:
typedef AZStd::function<void(double)> SetValueCallback;
typedef AZStd::function<double()> GetValueCallback;
SnapToWidget(QAction* defaultAction, SetValueCallback setValueCallback, GetValueCallback getValueCallback)
: m_setValueCallback(setValueCallback)
, m_getValueCallback(getValueCallback)
{
QHBoxLayout* layout = new QHBoxLayout();
setLayout(layout);
m_toolButton = new QToolButton();
m_toolButton->setAutoRaise(true);
m_toolButton->setCheckable(false);
m_toolButton->setDefaultAction(defaultAction);
m_spinBox = new AzQtComponents::DoubleSpinBox();
layout->addWidget(m_toolButton);
layout->addWidget(m_spinBox);
m_spinBox->setEnabled(defaultAction->isChecked());
m_spinBox->setMinimum(1e-2f);
{
QSignalBlocker signalBlocker(m_spinBox);
m_spinBox->setValue(m_getValueCallback());
}
QObject::connect(m_spinBox, QOverload<double>::of(&AzQtComponents::DoubleSpinBox::valueChanged), this, &SnapToWidget::OnValueChanged);
QObject::connect(defaultAction, &QAction::changed, this, &SnapToWidget::OnActionChanged);
}
void SetIcon(QIcon icon)
{
m_toolButton->setIcon(icon);
}
protected:
void OnValueChanged(double value)
{
m_setValueCallback(value);
}
void OnActionChanged()
{
m_spinBox->setEnabled(m_toolButton->isChecked());
}
private:
QToolButton* m_toolButton = nullptr;
AzQtComponents::DoubleSpinBox* m_spinBox = nullptr;
SetValueCallback m_setValueCallback;
GetValueCallback m_getValueCallback;
};
/////////////////////////////////////////////////////////////////////////////
// MainWindow
/////////////////////////////////////////////////////////////////////////////
@@ -1274,36 +1212,6 @@ void UndoRedoToolButton::Update(int count)
setEnabled(count > 0);
}
QWidget* MainWindow::CreateSnapToGridWidget()
{
SnapToWidget::SetValueCallback setCallback = [](double snapStep)
{
SandboxEditor::SetGridSnappingSize(snapStep);
};
SnapToWidget::GetValueCallback getCallback = []()
{
return SandboxEditor::GridSnappingSize();
};
return new SnapToWidget(m_actionManager->GetAction(ID_SNAP_TO_GRID), setCallback, getCallback);
}
QWidget* MainWindow::CreateSnapToAngleWidget()
{
SnapToWidget::SetValueCallback setCallback = [](double snapAngle)
{
SandboxEditor::SetAngleSnappingSize(snapAngle);
};
SnapToWidget::GetValueCallback getCallback = []()
{
return SandboxEditor::AngleSnappingSize();
};
return new SnapToWidget(m_actionManager->GetAction(ID_SNAPANGLE), setCallback, getCallback);
}
bool MainWindow::IsPreview() const
{
return GetIEditor()->IsInPreviewMode();
@@ -2016,12 +1924,6 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId)
case ID_TOOLBAR_WIDGET_REDO:
w = CreateUndoRedoButton(ID_REDO);
break;
case ID_TOOLBAR_WIDGET_SNAP_GRID:
w = CreateSnapToGridWidget();
break;
case ID_TOOLBAR_WIDGET_SNAP_ANGLE:
w = CreateSnapToAngleWidget();
break;
case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
w = CreateSpacerRightWidget();
break;