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

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Sandbox/Editor/MainStatusBar.cpp
+5 -12
View File
@@ -15,6 +15,7 @@
#include "MainStatusBar.h"
#include <AzCore/Utils/Utils.h>
// AzQtComponents
#include <AzQtComponents/Components/Widgets/CheckBox.h>
#include <AzQtComponents/Components/Style.h>
@@ -220,24 +221,16 @@ MainStatusBar::MainStatusBar(QWidget* parent)
void MainStatusBar::Init()
{
//called on mainwindow initialization
const int statusbarTimerUpdateInterval {
const int statusbarTimerUpdateInterval{
500
}; //in ms, so 2 FPS
AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
QString strGameInfo;
ICVar* pCVar = gEnv->pConsole->GetCVar("sys_game_folder");
if (pCVar)
{
strGameInfo = tr("GameFolder: '%1'").arg(QtUtil::ToQString(pCVar->GetString()));
}
pCVar = gEnv->pConsole->GetCVar("sys_dll_game");
if (pCVar)
{
strGameInfo += QLatin1String(" - ") + tr("GameDLL: '%1'").arg(QtUtil::ToQString(pCVar->GetString()));
}
strGameInfo = tr("GameFolder: '%1'").arg(projectPath.c_str());
SetItem(QStringLiteral("game_info"), strGameInfo, tr("Game Info"), QPixmap());
//ask for updates for items regulary. This is basically what MFC does
//ask for updates for items regularly. This is basically what MFC does
auto timer = new QTimer(this);
timer->setInterval(statusbarTimerUpdateInterval);
connect(timer, &QTimer::timeout, this, &MainStatusBar::requestStatusUpdate);