From e806d41c8703ddc4bcaf2186d0c1701bd1e1ada3 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Wed, 22 Dec 2021 12:16:38 +0000
Subject: Initial commit with some basic UI

---
 ui/window.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ui/window.h')

diff --git a/ui/window.h b/ui/window.h
index 9c6d023..25443bd 100644
--- a/ui/window.h
+++ b/ui/window.h
@@ -4,12 +4,12 @@
 #include "chronology.hpp"
 #include "collection.hpp"
 #include "gfx/gl/uiShader.h"
-#include "inputHandler.h" // IWYU pragma: keep
 #include "ptr.hpp"
+#include "uiComponent.h" // IWYU pragma: keep
 #include <SDL2/SDL.h>
+#include <cstddef>
 #include <special_members.hpp>
 #include <string>
-#include <type_traits>
 
 class GameState;
 
@@ -29,12 +29,12 @@ public:
 	void swapBuffers() const;
 
 protected:
-	SDL_GLContext glContext() const;
+	[[nodiscard]] SDL_GLContext glContext() const;
 	virtual void render(const GameState *) const;
 
 	using SDL_WindowPtr = wrapped_ptrt<SDL_Window, SDL_CreateWindow, SDL_DestroyWindow>;
 	SDL_WindowPtr m_window;
-	Collection<InputHandler> inputStack;
+	Collection<UIComponent> uiComponents;
 	UIShader uiShader;
 };
 
-- 
cgit v1.2.3