Added dynamic editor window size selection

Sources/Overload/OvEditor/src/OvEditor/Core/Context.cpp

@@ -8,12 +8,58 @@
 
 #include <OvRendering/Entities/Light.h>
 #include <OvCore/Global/ServiceLocator.h>
+#include <OvDebug/Assertion.h>
 
 #include "OvEditor/Core/Context.h"
 
 using namespace OvCore::Global;
 using namespace OvCore::ResourceManagement;
 
+constexpr std::array<std::pair<int, int>, 13> kResolutions
+{
+	std::make_pair(640, 360), // nHD
+	std::make_pair(854, 480), // FWVGA
+	std::make_pair(960, 540), // qHD
+	std::make_pair(1024, 576), // WSVGA
+	std::make_pair(1280, 720), // HD
+	std::make_pair(1366, 768), // FWXGA
+	std::make_pair(1600, 900), // HD+
+	std::make_pair(1920, 1080), // Full HD
+	std::make_pair(2560, 1440), // QHD
+	std::make_pair(3200, 1800), // QHD+
+	std::make_pair(3840, 2160), // 4K UHD
+	std::make_pair(5120, 2880), // 5K
+	std::make_pair(7680, 4320), // 8K UHD
+};
+
+std::array<int, 4> FindBestFitWindowSizeAndPosition(std::array<int, 4> p_workAreaSize)
+{
+	// Extract work area dimensions
+	int workAreaX = p_workAreaSize[0];
+	int workAreaY = p_workAreaSize[1];
+	int workAreaWidth = p_workAreaSize[2];
+	int workAreaHeight = p_workAreaSize[3];
+
+	// Iterate over available resolutions
+	for (auto it = kResolutions.rbegin(); it != kResolutions.rend(); ++it)
+	{
+		int width = it->first;
+		int height = it->second;
+
+		// Check if resolution fits within work area
+		if (width <= workAreaWidth && height <= workAreaHeight)
+		{
+			// Center the resolution within the work area
+			int posX = workAreaX + workAreaWidth / 2 - width / 2;
+			int posY = workAreaY + workAreaHeight / 2 - height / 2;
+
+			return { posX, posY, width, height };
+		}
+	}
+
+	OVASSERT(false, "No resolution found to fit the work area");
+}
+
 OvEditor::Core::Context::Context(const std::string& p_projectPath, const std::string& p_projectName) :
 	projectPath(p_projectPath),
 	projectName(p_projectName),
@@ -41,23 +87,21 @@ OvEditor::Core::Context::Context(const std::string& p_projectPath, const std::st
 	OvWindowing::Settings::DeviceSettings deviceSettings;
 	deviceSettings.contextMajorVersion = 4;
 	deviceSettings.contextMinorVersion = 3;
-	windowSettings.title = "Overload Editor";
-	windowSettings.width = 1600;
-	windowSettings.height = 900;
 
 	/* Window creation */
 	device = std::make_unique<OvWindowing::Context::Device>(deviceSettings);
+	const auto workAreaSize = device->GetWorkAreaSize();
+	const auto bestFitWindowSizeAndPosition = FindBestFitWindowSizeAndPosition(workAreaSize);
+	windowSettings.title = "Overload Editor";
+	windowSettings.x = bestFitWindowSizeAndPosition[0];
+	windowSettings.y = bestFitWindowSizeAndPosition[1];
+	windowSettings.width = bestFitWindowSizeAndPosition[2];
+	windowSettings.height = bestFitWindowSizeAndPosition[3];
 	window = std::make_unique<OvWindowing::Window>(*device, windowSettings);
 	std::vector<uint64_t> iconRaw = { 0,0,144115188614240000,7500771567664627712,7860776967494637312,0,0,0,0,7212820467466371072,11247766461832697600,14274185407633888512,12905091124788992000,5626708973701824512,514575842263176960,0,0,6564302121125019648,18381468271671515136,18381468271654737920,18237353083595659264,18165295488836311040,6708138037527189504,0,4186681893338480640,7932834557741046016,17876782538917681152,11319824055216379904,15210934132358518784,18381468271520454400,1085667680982603520,0,18093237891929479168,18309410677600032768,11391881649237530624,7932834561381570304,17300321784231761408,15210934132375296000,8293405106311272448,2961143145139082752,16507969723533236736,17516777143216379904,10671305705855129600,7356091234422036224,16580027318695106560,2240567205413984000,18381468271470188544,10959253511276599296,4330520004484136960,10815138323200743424,11607771853338181632,8364614976649238272,17444719546862998784,2669156352,18381468269893064448,6419342512197474304,11103650170688640000,6492244531366860800,14346241902646925312,13841557270159628032,7428148827772098304,3464698581331941120,18381468268953606144,1645680384,18381468271554008832,7140201027266418688,5987558797656659712,17588834734687262208,7284033640602212096,14273902834169157632,18381468269087692288,6852253225049397248,17732667349600245504,16291515470083266560,10022503688432981760,11968059825861367552,9733991836700645376,14850363587428816640,18381468271168132864,16147400282007410688,656430432014827520,18381468270950094848,15715054717226194944,72057596690306560,11823944635485519872,15859169905251653376,17084149004500473856,8581352906816952064,2527949855582584832,18381468271419856896,8581352907253225472,252776704,1376441223417430016,14994761349590357760,10527190521537370112,0,9806614576878321664,18381468271671515136,17156206598538401792,6059619689256392448,10166619973990488064,18381468271403079424,17444719549178451968,420746240,870625192710242304,4906133035823863552,18381468269289150464,18381468271671515136,18381468271671515136,9950729769032620032,14778305994951169792,269422336,0,0,18381468268785833984,8941923452686178304,18381468270950094848,3440842496,1233456333565402880,0,0,0,11823944636091210240,2383877888,16724143605745719296,2316834816,0,0 };
 	window->SetIconFromMemory(reinterpret_cast<uint8_t*>(iconRaw.data()), 16, 16);
 	inputManager = std::make_unique<OvWindowing::Inputs::InputManager>(*window);
 	window->MakeCurrentContext();
-
-	/* Center Window */
-	auto [monWidth, monHeight] = device->GetMonitorSize();
-	auto [winWidth, winHeight] = window->GetSize();
-	window->SetPosition(monWidth / 2 - winWidth / 2, monHeight / 2 - winHeight / 2);
-
 	device->SetVsync(true);
 
 	/* Graphics context creation */

Sources/Overload/OvWindowing/include/OvWindowing/Context/Device.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include <unordered_map>
+#include <array>
 
 #include <OvTools/Eventing/Event.h>
 
@@ -46,6 +47,11 @@ namespace OvWindowing::Context
 		*/
 		std::pair<int16_t, int16_t> GetMonitorSize() const;
 
+		/**
+		* Return the size, in pixels, of the work area of the primary monitor
+		*/
+		std::array<int, 4> GetWorkAreaSize() const;
+
 		/**
 		* Return an instance of GLFWcursor corresponding to the given shape
 		* @param p_cursorShape

Sources/Overload/OvWindowing/include/OvWindowing/Settings/WindowSettings.h

@@ -39,6 +39,16 @@ namespace OvWindowing::Settings
 		*/
 		uint16_t height;
 
+		/**
+		* X position of the window
+		*/
+		int16_t x = 0;
+
+		/**
+		* Y position of the window
+		*/
+		int16_t y = 0;
+
 		/**
 		* Minimum width of the window.
 		* Use WindowSettings::DontCare to disable limit

Sources/Overload/OvWindowing/src/OvWindowing/Context/Device.cpp

@@ -56,6 +56,20 @@ std::pair<int16_t, int16_t> OvWindowing::Context::Device::GetMonitorSize() const
 	return std::pair<int16_t, int16_t>(static_cast<int16_t>(mode->width), static_cast<int16_t>(mode->height));
 }
 
+std::array<int, 4> OvWindowing::Context::Device::GetWorkAreaSize() const
+{
+	std::array<int, 4> workArea;
+
+	glfwGetMonitorWorkarea(
+		glfwGetPrimaryMonitor(),
+		workArea.data(),
+		workArea.data() + 1,
+		workArea.data() + 2,
+		workArea.data() + 3);
+
+	return workArea;
+}
+
 GLFWcursor * OvWindowing::Context::Device::GetCursorInstance(Cursor::ECursorShape p_cursorShape) const
 {
 	return m_cursors.at(p_cursorShape);

Sources/Overload/OvWindowing/src/OvWindowing/Window.cpp

@@ -20,6 +20,7 @@ OvWindowing::Window::Window(const Context::Device& p_device, const Settings::Win
 	m_device(p_device),
 	m_title(p_windowSettings.title),
 	m_size{ p_windowSettings.width, p_windowSettings.height },
+	m_position{ p_windowSettings.x, p_windowSettings.y },
 	m_minimumSize { p_windowSettings.minimumWidth, p_windowSettings.minimumHeight },
 	m_maximumSize { p_windowSettings.maximumWidth, p_windowSettings.maximumHeight },
 	m_fullscreen(p_windowSettings.fullscreen),
@@ -328,11 +329,7 @@ void OvWindowing::Window::CreateGlfwWindow(const Settings::WindowSettings& p_win
 	else
 	{
 		UpdateSizeLimit();
-
-		auto[x, y] = GetPosition();
-		m_position.first = x;
-		m_position.second = y;
-
+		SetPosition(m_position.first, m_position.second);
 		__WINDOWS_MAP[m_glfwWindow] = this;
 	}
 }