load window size from prefs only if unspecified

Author: nmwsharp

include/polyscope/context.h

@@ -75,8 +75,8 @@ struct Context {
 
   int bufferWidth = -1;
   int bufferHeight = -1;
-  int windowWidth = 1280;
-  int windowHeight = 720;
+  int windowWidth = -1;  // on init(), get overwritten with defaultWindowWidth if -1
+  int windowHeight = -1; // ^^^ same
   int initWindowPosX = 20;
   int initWindowPosY = 20;
   bool windowResizable = true;

include/polyscope/view.h

@@ -69,6 +69,8 @@ extern float& flightTargetFov;
 extern float& flightInitialFov;
 
 // Default values
+extern const int defaultWindowWidth;
+extern const int defaultWindowHeight;
 extern const double defaultNearClipRatio;
 extern const double defaultFarClipRatio;
 extern const double defaultFov;

src/polyscope.cpp

@@ -66,11 +66,11 @@ void readPrefsFile() {
 
       // Set values
       // Do some basic validation on the sizes first to work around bugs with bogus values getting written to init file
-      if (prefsJSON.count("windowWidth") > 0) {
+      if (view::windowWidth == -1 && prefsJSON.count("windowWidth") > 0) { // only load if not already set
         int val = prefsJSON["windowWidth"];
         if (val >= 64 && val < 10000) view::windowWidth = val;
       }
-      if (prefsJSON.count("windowHeight") > 0) {
+      if (view::windowHeight == -1 && prefsJSON.count("windowHeight") > 0) { // only load if not already set
         int val = prefsJSON["windowHeight"];
         if (val >= 64 && val < 10000) view::windowHeight = val;
       }
@@ -148,6 +148,8 @@ void init(std::string backend) {
   if (options::usePrefsFile) {
     readPrefsFile();
   }
+  if (view::windowWidth == -1) view::windowWidth = view::defaultWindowWidth;
+  if (view::windowHeight == -1) view::windowHeight = view::defaultWindowHeight;
 
   // Initialize the rendering engine
   render::initializeRenderEngine(backend);

src/view.cpp

@@ -44,6 +44,8 @@ float& flightInitialFov = state::globalContext.flightInitialFov;
 
 
 // Default values
+const int defaultWindowWidth = 1280;
+const int defaultWindowHeight = 720;
 const double defaultNearClipRatio = 0.005;
 const double defaultFarClipRatio = 20.0;
 const double defaultFov = 45.;