From c6fb8dd64e0c323e46c73162e21a3a34103bb407 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Tue, 8 Apr 2025 02:32:39 +0100
Subject: Create Windows with a size object

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

(limited to 'ui')

diff --git a/ui/mainWindow.cpp b/ui/mainWindow.cpp
index 8d46d43..57dabc0 100644
--- a/ui/mainWindow.cpp
+++ b/ui/mainWindow.cpp
@@ -8,7 +8,7 @@
 #include "backends/imgui_impl_sdl2.h"
 #pragma GCC diagnostic pop
 
-MainWindow::MainWindow(size_t w, size_t h, const char * title, Uint32 flags) : Window {w, h, title, flags}
+MainWindow::MainWindow(ScreenAbsCoord size, const char * title, Uint32 flags) : Window {size, title, flags}
 {
 	if (const auto version = gladLoadGL(reinterpret_cast<GLADloadfunc>(SDL_GL_GetProcAddress)); version < 30003) {
 		throw std::runtime_error {std::format("Insufficient OpenGL version: {}", version)};
diff --git a/ui/mainWindow.h b/ui/mainWindow.h
index 490ef09..d2de9b3 100644
--- a/ui/mainWindow.h
+++ b/ui/mainWindow.h
@@ -5,8 +5,7 @@
 
 class MainWindow : public Window {
 public:
-	MainWindow(
-			size_t width, size_t height, const char * title, Uint32 flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL);
+	MainWindow(ScreenAbsCoord size, const char * title, Uint32 flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_OPENGL);
 	~MainWindow() override;
 
 	NO_MOVE(MainWindow);
diff --git a/ui/window.cpp b/ui/window.cpp
index 3d4634e..06857b2 100644
--- a/ui/window.cpp
+++ b/ui/window.cpp
@@ -7,8 +7,7 @@
 #include "backends/imgui_impl_sdl2.h"
 #pragma GCC diagnostic pop
 
-Window::Window(size_t width, size_t height, const char * title, Uint32 flags) :
-	size {static_cast<int>(width), static_cast<int>(height)},
+Window::Window(ScreenAbsCoord size, const char * title, Uint32 flags) :
 	m_window {title, static_cast<int>(SDL_WINDOWPOS_CENTERED), static_cast<int>(SDL_WINDOWPOS_CENTERED), size.x, size.y,
 			flags},
 	glContext {m_window}
diff --git a/ui/window.h b/ui/window.h
index 1c3d09c..99a977f 100644
--- a/ui/window.h
+++ b/ui/window.h
@@ -15,7 +15,7 @@ using SDL_GLContextPtr = wrapped_ptrt<GL_Context, SDL_GL_CreateContext, SDL_GL_D
 
 class Window {
 public:
-	Window(size_t width, size_t height, const char * title, Uint32 flags);
+	Window(ScreenAbsCoord size, const char * title, Uint32 flags);
 	virtual ~Window() = default;
 
 	NO_COPY(Window);
@@ -39,7 +39,6 @@ public:
 protected:
 	void clear(float r, float g, float b, float a) const;
 
-	const ScreenAbsCoord size;
 	SDL_WindowPtr m_window;
 	SDL_GLContextPtr glContext;
 	WindowContent::Ptr content;
-- 
cgit v1.2.3