|
2 | 2 | #include "ImGuiProviderSystemComponent.h"
|
3 | 3 | #include <Atom/Feature/ImGui/SystemBus.h>
|
4 | 4 | #include <AzCore/Component/EntityId.h>
|
| 5 | +#include <AzCore/Console/IConsole.h> |
5 | 6 | #include <AzCore/Debug/Trace.h>
|
6 | 7 | #include <AzCore/base.h>
|
7 | 8 | #include <AzCore/std/algorithm.h>
|
|
12 | 13 | #include <AzCore/std/utility/pair.h>
|
13 | 14 | #include <AzFramework/Viewport/ViewportBus.h>
|
14 | 15 | #include <ImGui/ImGuiPass.h>
|
| 16 | + |
15 | 17 | #include <ImGuiBus.h>
|
16 | 18 | #include <ImGuiProvider/ImGuiProviderBus.h>
|
17 | 19 | #include <ImGuiProvider/ImGuiProviderTypeIds.h>
|
|
23 | 25 | namespace ImGuiProvider
|
24 | 26 | {
|
25 | 27 |
|
| 28 | + AZ_CVAR(bool, cl_hide_menu_bar, false, nullptr, AZ::ConsoleFunctorFlags::Null, "Hide Menu Bar if the flag is enabled"); |
| 29 | + |
26 | 30 | AZ_COMPONENT_IMPL(ImGuiProviderSystemComponent, "ImGuiProviderSystemComponent", ImGuiProviderSystemComponentTypeId);
|
27 | 31 |
|
28 | 32 | void ImGuiProviderSystemComponent::Reflect(AZ::ReflectContext* context)
|
@@ -77,14 +81,23 @@ namespace ImGuiProvider
|
77 | 81 | AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationBus::Events::QueryApplicationType, appType);
|
78 | 82 | m_appInEditor = appType.IsEditor();
|
79 | 83 |
|
80 |
| - ImGuiProviderRequestBus::Handler::BusConnect(); |
81 |
| - AZ::TickBus::Handler::BusConnect(); |
| 84 | + if (!cl_hide_menu_bar) |
| 85 | + { |
| 86 | + ImGuiProviderRequestBus::Handler::BusConnect(); |
| 87 | + AZ::TickBus::Handler::BusConnect(); |
| 88 | + } |
82 | 89 | }
|
83 | 90 |
|
84 | 91 | void ImGuiProviderSystemComponent::Deactivate()
|
85 | 92 | {
|
86 |
| - AZ::TickBus::Handler::BusDisconnect(); |
87 |
| - ImGuiProviderRequestBus::Handler::BusDisconnect(); |
| 93 | + if (AZ::TickBus::Handler::BusIsConnected()) |
| 94 | + { |
| 95 | + AZ::TickBus::Handler::BusDisconnect(); |
| 96 | + } |
| 97 | + if (ImGuiProviderRequestBus::Handler::BusIsConnected()) |
| 98 | + { |
| 99 | + ImGuiProviderRequestBus::Handler::BusDisconnect(); |
| 100 | + } |
88 | 101 | AZStd::vector<ImGuiFeaturePath> features;
|
89 | 102 | for (auto& feature : m_registeredFeatures)
|
90 | 103 | {
|
|
0 commit comments