Use the new Atom API instead of the removed r_displayInfo for ViewportTitleDlg

Code/Sandbox/Editor/CMakeLists.txt

@@ -124,6 +124,7 @@ ly_add_target(
             Gem::Atom_RPI.Public
             Gem::Atom_Feature_Common.Static
             Gem::AtomToolsFramework.Static
+            Gem::AtomViewportDisplayInfo
             ${additional_dependencies}
         PUBLIC
             3rdParty::AWSNativeSDK::Core

Code/Sandbox/Editor/ViewportTitleDlg.cpp

@@ -13,7 +13,7 @@
 
 // Description : CViewportTitleDlg implementation file
 
-
+#if !defined(Q_MOC_RUN)
 #include "EditorDefs.h"
 
 #include "ViewportTitleDlg.h"
@@ -36,10 +36,13 @@
 #include "UsedResources.h"
 #include "Include/IObjectManager.h"
 
+#include <AtomLyIntegration/AtomViewportDisplayInfo/AtomViewportInfoDisplayBus.h>
+
 
 AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
 #include "ui_ViewportTitleDlg.h"
 AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
+#endif //!defined(Q_MOC_RUN)
 
 
 // CViewportTitleDlg dialog
@@ -63,6 +66,32 @@ inline namespace Helpers
     }
 }
 
+namespace
+{
+    class CViewportTitleDlgDisplayInfoHelper
+        : public QObject
+        , public AZ::AtomBridge::AtomViewportInfoDisplayNotificationBus::Handler
+    {
+        Q_OBJECT
+
+    public:
+        CViewportTitleDlgDisplayInfoHelper(CViewportTitleDlg* parent)
+            : QObject(parent)
+        {
+            AZ::AtomBridge::AtomViewportInfoDisplayNotificationBus::Handler::BusConnect();
+        }
+
+    signals:
+        void ViewportInfoStatusUpdated(int newIndex);
+
+    private:
+        void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state)
+        {
+            emit ViewportInfoStatusUpdated(static_cast<int>(state));
+        }
+    };
+} //end anonymous namespace
+
 CViewportTitleDlg::CViewportTitleDlg(QWidget* pParent)
     : QWidget(pParent)
     , m_ui(new Ui::ViewportTitleDlg)
@@ -115,14 +144,11 @@ void CViewportTitleDlg::OnInitDialog()
 
     m_ui->m_toggleHelpersBtn->setChecked(GetIEditor()->GetDisplaySettings()->IsDisplayHelpers());
 
-    ICVar*  pDisplayInfo(gEnv->pConsole->GetCVar("r_displayInfo"));
-    if (pDisplayInfo)
-    {
-        SFunctor oFunctor;
-        oFunctor.Set(OnChangedDisplayInfo, pDisplayInfo, m_ui->m_toggleDisplayInfoBtn);
-        m_displayInfoCallbackIndex = pDisplayInfo->AddOnChangeFunctor(oFunctor);
-        OnChangedDisplayInfo(pDisplayInfo, m_ui->m_toggleDisplayInfoBtn);
-    }
+
+    // Add a child parented to us that listens for r_displayInfo changes.
+    auto displayInfoHelper = new CViewportTitleDlgDisplayInfoHelper(this);
+    connect(displayInfoHelper, &CViewportTitleDlgDisplayInfoHelper::ViewportInfoStatusUpdated, this, &CViewportTitleDlg::UpdateDisplayInfo);
+    UpdateDisplayInfo();
 
     connect(m_ui->m_toggleHelpersBtn, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleHelpers);
     connect(m_ui->m_toggleDisplayInfoBtn, &QToolButton::clicked, this, &CViewportTitleDlg::OnToggleDisplayInfo);
@@ -156,6 +182,32 @@ void CViewportTitleDlg::OnToggleHelpers()
 //////////////////////////////////////////////////////////////////////////
 void CViewportTitleDlg::OnToggleDisplayInfo()
 {
+    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
+        state,
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
+    );
+    state = static_cast<AZ::AtomBridge::ViewportInfoDisplayState>(static_cast<int>(state)+1);
+    if (state == AZ::AtomBridge::ViewportInfoDisplayState::Invalid)
+    {
+        state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
+    }
+    // SetDisplayState will fire OnViewportInfoDisplayStateChanged and notify us, no need to call UpdateDisplayInfo.
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Broadcast(
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::SetDisplayState,
+        state
+    );
+}
+
+//////////////////////////////////////////////////////////////////////////
+void CViewportTitleDlg::UpdateDisplayInfo()
+{
+    AZ::AtomBridge::ViewportInfoDisplayState state = AZ::AtomBridge::ViewportInfoDisplayState::NoInfo;
+    AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::BroadcastResult(
+        state,
+        &AZ::AtomBridge::AtomViewportInfoDisplayRequestBus::Events::GetDisplayState
+    );
+    m_ui->m_toggleDisplayInfoBtn->setChecked(state != AZ::AtomBridge::ViewportInfoDisplayState::NoInfo);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -544,10 +596,6 @@ void CViewportTitleDlg::UpdateCustomPresets(const QString& text, QStringList& cu
     }
 }
 
-void CViewportTitleDlg::OnChangedDisplayInfo([[maybe_unused]] ICVar* pDisplayInfo, [[maybe_unused]] QAbstractButton* pDisplayInfoButton)
-{
-}
-
 bool CViewportTitleDlg::eventFilter(QObject* object, QEvent* event)
 {
     bool consumeEvent = false;
@@ -609,4 +657,5 @@ namespace AzToolsFramework
     }
 }
 
+#include "ViewportTitleDlg.moc"
 #include <moc_ViewportTitleDlg.cpp>

Code/Sandbox/Editor/ViewportTitleDlg.h

@@ -60,7 +60,6 @@ public:
     static void LoadCustomPresets(const QString& section, const QString& keyName, QStringList& outCustompresets);
     static void SaveCustomPresets(const QString& section, const QString& keyName, const QStringList& custompresets);
     static void UpdateCustomPresets(const QString& text, QStringList& custompresets);
-    static void OnChangedDisplayInfo(ICVar*    pDisplayInfo, QAbstractButton* pDisplayInfoButton);
 
     bool eventFilter(QObject* object, QEvent* event) override;
 
@@ -77,6 +76,7 @@ protected:
     void OnMaximize();
     void OnToggleHelpers();
     void OnToggleDisplayInfo();
+    void UpdateDisplayInfo();
 
     QString m_title;
 
@@ -87,8 +87,6 @@ protected:
     QStringList m_customFOVPresets;
     QStringList m_customAspectRatioPresets;
 
-    uint64 m_displayInfoCallbackIndex;
-
     void OnMenuFOVCustom();
 
     void CreateFOVMenu();