ed/Cog
1
0
Fork 0
mirror of https://github.com/Ed94/Cog.git synced 2026-07-26 17:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

CogWindow: Rename CreateWindow to AddWindow to prevent name conflict with windows headers

Browse Source 
CogSample : Projectile progress
This commit is contained in:
Arnaud Jamin
2023-10-30 23:44:24 -04:00
parent 315782183d
commit 7f88f5d53a
10 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Plugins/Cog/Source/CogWindow/Private/CogWindowManager.cpp
+5 -5
View File
@@ -53,12 +53,12 @@ void UCogWindowManager::InitializeInternal()
IniHandler.UserData = this;
ImGui::AddSettingsHandler(&IniHandler);
SpaceWindows.Add(CreateWindow<FCogWindow_Spacing>("Spacing 1", false));
SpaceWindows.Add(CreateWindow<FCogWindow_Spacing>("Spacing 2", false));
SpaceWindows.Add(CreateWindow<FCogWindow_Spacing>("Spacing 3", false));
SpaceWindows.Add(CreateWindow<FCogWindow_Spacing>("Spacing 4", false));
SpaceWindows.Add(AddWindow<FCogWindow_Spacing>("Spacing 1", false));
SpaceWindows.Add(AddWindow<FCogWindow_Spacing>("Spacing 2", false));
SpaceWindows.Add(AddWindow<FCogWindow_Spacing>("Spacing 3", false));
SpaceWindows.Add(AddWindow<FCogWindow_Spacing>("Spacing 4", false));
SettingsWindow = CreateWindow<FCogWindow_Settings>("Window.Settings", false);
SettingsWindow = AddWindow<FCogWindow_Settings>("Window.Settings", false);
ConsoleCommands.Add(IConsoleManager::Get().RegisterConsoleCommand(
*ToggleInputCommand,
Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h
+1 -1
View File
@@ -85,7 +85,7 @@ public:
const UObject* GetAsset(const TSubclassOf<UObject> AssetClass);
template<class T>
T* CreateWindow(const FString& Name, bool AddToMainMenu = true)
T* AddWindow(const FString& Name, bool AddToMainMenu = true)
{
T* Window = new T();
AddWindow(Window, Name, AddToMainMenu);