From 88c0b08d30430ea15d56766baea6676a81f1dffc Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Sun, 12 Dec 2021 08:19:34 -0500
Subject: [PATCH] Change default resolution to 1280x720. Add check for invalid
 window pos and size.

---
 src/settings.cpp      | 2 +-
 src/window/Window.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/settings.cpp b/src/settings.cpp
index 5ddf75c6..6b7add6d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -21,7 +21,7 @@ bool isPlugin = false;
 
 std::string token;
 bool windowMaximized = false;
-math::Vec windowSize = math::Vec(1024, 768);
+math::Vec windowSize = math::Vec(1280, 720);
 math::Vec windowPos = math::Vec(NAN, NAN);
 bool invertZoom = false;
 float pixelRatio = 0.0;
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index e6d51963..e481b16b 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -271,7 +271,7 @@ Window::Window() {
 #endif
 
 	// Create window
-	win = glfwCreateWindow(1024, 768, "", NULL, NULL);
+	win = glfwCreateWindow(1280, 720, "", NULL, NULL);
 	if (!win) {
 		osdialog_message(OSDIALOG_ERROR, OSDIALOG_OK, "Could not open GLFW window. Does your graphics card support OpenGL 2.0 or greater? If so, make sure you have the latest graphics drivers installed.");
 		throw Exception("Could not create Window");
@@ -282,8 +282,10 @@ Window::Window() {
 	INFO("Window content scale: %f", contentScale);
 
 	glfwSetWindowSizeLimits(win, WINDOW_SIZE_MIN.x, WINDOW_SIZE_MIN.y, GLFW_DONT_CARE, GLFW_DONT_CARE);
-	glfwSetWindowSize(win, settings::windowSize.x, settings::windowSize.y);
-	if (settings::windowPos.isFinite()) {
+	if (settings::windowSize.x > 0 && settings::windowSize.y > 0) {
+		glfwSetWindowSize(win, settings::windowSize.x, settings::windowSize.y);
+	}
+	if (settings::windowPos.x > 0 && settings::windowPos.y > 0) {
 		glfwSetWindowPos(win, settings::windowPos.x, settings::windowPos.y);
 	}
 	if (settings::windowMaximized) {