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

Changed Play Console to right of toolbar.

Browse Source
This commit is contained in:
jjjoness
2021-04-22 15:45:55 +01:00
parent c66e2f4bcf
commit 012ab89a23
5 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/ToolbarManager.cpp
+14 -3
View File
@@ -511,6 +511,7 @@ void ToolbarManager::InitializeStandardToolbars()
m_standardToolbars.reserve(5 + macroToolbars.size());
m_standardToolbars.push_back(GetEditModeToolbar());
m_standardToolbars.push_back(GetObjectToolbar());
m_standardToolbars.push_back(GetPlayConsoleToolbar());
IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}");
IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}");
@@ -519,6 +520,7 @@ void ToolbarManager::InitializeStandardToolbars()
m_standardToolbars.push_back(GetMiscToolbar());
}
std::copy(std::begin(macroToolbars), std::end(macroToolbars), std::back_inserter(m_standardToolbars));
// Save that default state to future versions can reason about updating modified standard toolbars
@@ -597,8 +599,6 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const
t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION);
t.AddAction(ID_EDITMODE_SELECTAREA, ORIGINAL_TOOLBAR_VERSION);
t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
t.AddAction(ID_TOOLBAR_WIDGET_REF_COORD, ORIGINAL_TOOLBAR_VERSION);
t.AddAction(ID_SELECT_AXIS_X, ORIGINAL_TOOLBAR_VERSION);
@@ -636,6 +636,17 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const
return t;
}
AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
{
AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console Toolbar"));
t.SetMainToolbar(true);
t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION);
t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
return t;
}
AmazonToolbar ToolbarManager::GetEditorsToolbar() const
{
AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar"));
@@ -767,7 +778,7 @@ void ToolbarManager::InstantiateToolbars()
for (int i = 0; i < numToolbars; ++i)
{
InstantiateToolbar(i);
if (i == 1)
if (i == 2)
{
// Hack. Just copying how it was
m_mainWindow->addToolBarBreak();