SDL: restore window size #95

Author: chrisws

src/platform/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.6.3'
+    classpath 'com.android.tools.build:gradle:4.0.0'
     classpath "com.github.ben-manes:gradle-versions-plugin:0.22.0"
   }
 }

src/platform/android/jni/runtime.h

@@ -1,6 +1,6 @@
 // This file is part of SmallBASIC
 //
-// Copyright(C) 2001-2016 Chris Warren-Smith.
+// Copyright(C) 2001-2020 Chris Warren-Smith.
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
@@ -61,6 +61,8 @@ struct Runtime : public System {
   void runShell();
   char *loadResource(const char *fileName);
   void optionsBox(StringList *items);
+  void restoreWindowRect() {}
+  void saveWindowRect() {}
   void setWindowSize(int width, int height) {};
   void setWindowTitle(const char *title) {}
   void share(const char *path) { setString("share", path); }

src/platform/sdl/runtime.cpp

@@ -804,14 +804,14 @@ char *Runtime::getClipboardText() {
   return result;
 }
 
-void Runtime::setActive(bool active) {
-  setRunning(active);
-  if (active) {
-    setWindowRect(_saveRect);
-  } else {
-    SDL_SetWindowSize(_window, _saveRect.w, _saveRect.h);
-    setWindowSize(_saveRect.w, _saveRect.h);
-  }
+void Runtime::restoreWindowRect() {
+  SDL_SetWindowPosition(_window, _saveRect.x, _saveRect.y);
+  SDL_SetWindowSize(_window, _saveRect.w, _saveRect.h);
+  setWindowSize(_saveRect.w, _saveRect.h);
+}
+
+void Runtime::saveWindowRect() {
+  setWindowRect(_saveRect);
 }
 
 //
@@ -857,12 +857,12 @@ void maWait(int timeout) {
 // sbasic implementation
 //
 int osd_devinit(void) {
-  runtime->setActive(true);
+  runtime->setRunning(true);
   return 1;
 }
 
 int osd_devrestore(void) {
-  runtime->setActive(false);
+  runtime->setRunning(false);
   return 0;
 }
 

src/platform/sdl/runtime.h

@@ -45,6 +45,8 @@ struct Runtime : public System {
   MAEvent processEvents(int waitFlag);
   void processEvent(MAEvent &event);
   void pushEvent(MAEvent *event);
+  void restoreWindowRect();
+  void saveWindowRect();
   void setWindowSize(int width, int height);
   void setWindowTitle(const char *title);
   void share(const char *path) {}
@@ -58,7 +60,6 @@ struct Runtime : public System {
   char *getClipboardText();
   void setWindowRect(SDL_Rect &rect);
   SDL_Rect getWindowRect();
-  void setActive(bool running);
 
 private:
   int _menuX, _menuY;

src/ui/system.cpp

@@ -158,6 +158,8 @@ bool System::execute(const char *bas) {
   _state = kRunState;
   setWindowTitle(bas);
   showCursor(kArrow);
+  saveWindowRect();
+
   int result = ::sbasic_main(bas);
   if (isRunning()) {
     _state = kActiveState;
@@ -166,6 +168,10 @@ bool System::execute(const char *bas) {
   if (_editor == nullptr) {
     opt_command[0] = '\0';
   }
+
+  if (!_mainBas) {
+    restoreWindowRect();
+  }
   enableCursor(true);
   opt_file_permitted = 1;
   opt_loadmod = 0;

src/ui/system.h

@@ -62,6 +62,8 @@ struct System {
   virtual MAEvent processEvents(int waitFlag) = 0;
   virtual char *loadResource(const char *fileName);
   virtual void optionsBox(StringList *items) = 0;
+  virtual void restoreWindowRect() = 0;
+  virtual void saveWindowRect() = 0;
   virtual void setWindowSize(int width, int height) = 0;
   virtual void setWindowTitle(const char *title) = 0;
   virtual void share(const char *path) = 0;