From cb6957e78683cbe4887dac80c1ff23dc9523c4cf Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 6 Apr 2025 12:41:58 +0100
Subject: Drop WindowContent::render const

ImGui promotes "doing things immediately" and this const makes that very
awkward.
---
 ui/gameMainWindow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/gameMainWindow.h')

diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h
index b0f1592..14e099c 100644
--- a/ui/gameMainWindow.h
+++ b/ui/gameMainWindow.h
@@ -14,7 +14,7 @@ public:
 	NO_COPY(GameMainWindow);
 
 	void tick(TickDuration) override;
-	void render() const override;
+	void render() override;
 
 private:
 	bool handleInput(const SDL_Event &) override;
-- 
cgit v1.2.3


From 0255a421906b9b3a77d9b51eb7d0126f16a9f0db Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 8 Apr 2025 02:14:41 +0100
Subject: Create WindowContent with a size object

Not individual width/height parameters.
---
 ui/gameMainWindow.cpp | 2 +-
 ui/gameMainWindow.h   | 2 +-
 ui/window.h           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui/gameMainWindow.h')

diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index afb7a2e..e87009f 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -50,7 +50,7 @@ private:
 	GameMainSelector * gms;
 };
 
-GameMainWindow::GameMainWindow(size_t w, size_t h) : SceneRenderer {{w, h}, 0}
+GameMainWindow::GameMainWindow(ScreenAbsCoord size) : SceneRenderer {size, 0}
 {
 	uiComponents.create<ManualCameraController>(glm::vec2 {310'727'624, 494'018'810});
 	auto gms = uiComponents.create<GameMainSelector>(&camera);
diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h
index 14e099c..41163d0 100644
--- a/ui/gameMainWindow.h
+++ b/ui/gameMainWindow.h
@@ -7,7 +7,7 @@
 
 class GameMainWindow : public WindowContent, SceneRenderer, public SceneProvider {
 public:
-	GameMainWindow(size_t w, size_t h);
+	GameMainWindow(ScreenAbsCoord size);
 	~GameMainWindow() override;
 
 	NO_MOVE(GameMainWindow);
diff --git a/ui/window.h b/ui/window.h
index 0316a1f..1c3d09c 100644
--- a/ui/window.h
+++ b/ui/window.h
@@ -27,7 +27,7 @@ public:
 	{
 		glm::ivec2 size {};
 		SDL_GetWindowSizeInPixels(m_window, &size.x, &size.y);
-		content = std::make_unique<C>(size.x, size.y, std::forward<P>(p)...);
+		content = std::make_unique<C>(ScreenAbsCoord {size.x, size.y}, std::forward<P>(p)...);
 	}
 
 	void tick(TickDuration elapsed);
-- 
cgit v1.2.3


From 463e0279906fad996cf172e206cb7cb29991c25b Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 8 Apr 2025 02:38:10 +0100
Subject: Remove GameMainWindow empty destructor and special members

---
 ui/gameMainWindow.cpp | 2 --
 ui/gameMainWindow.h   | 5 -----
 2 files changed, 7 deletions(-)

(limited to 'ui/gameMainWindow.h')

diff --git a/ui/gameMainWindow.cpp b/ui/gameMainWindow.cpp
index e87009f..dbbf8a7 100644
--- a/ui/gameMainWindow.cpp
+++ b/ui/gameMainWindow.cpp
@@ -57,8 +57,6 @@ GameMainWindow::GameMainWindow(ScreenAbsCoord size) : SceneRenderer {size, 0}
 	uiComponents.create<GameMainToolbar>(gms);
 }
 
-GameMainWindow::~GameMainWindow() { }
-
 void
 GameMainWindow::tick(TickDuration)
 {
diff --git a/ui/gameMainWindow.h b/ui/gameMainWindow.h
index 41163d0..71b6314 100644
--- a/ui/gameMainWindow.h
+++ b/ui/gameMainWindow.h
@@ -3,15 +3,10 @@
 #include "chronology.h"
 #include "gfx/gl/sceneRenderer.h"
 #include "windowContent.h"
-#include <cstddef>
 
 class GameMainWindow : public WindowContent, SceneRenderer, public SceneProvider {
 public:
 	GameMainWindow(ScreenAbsCoord size);
-	~GameMainWindow() override;
-
-	NO_MOVE(GameMainWindow);
-	NO_COPY(GameMainWindow);
 
 	void tick(TickDuration) override;
 	void render() override;
-- 
cgit v1.2.3