UI: avoid flicker from with ALT+F4 -e edit startup

Author: chrisws

ChangeLog

@@ -1,3 +1,7 @@
+2019-11-02 (0.12.15)
+	UI: ALT+F4 from edit/run now returns to edit
+	UI: avoid flicker from with ALT+F4 -e edit startup
+
 2019-02-02 (0.12.15)
 	UI: Edit enter now continues prior line comment
 

src/platform/android/jni/runtime.cpp

@@ -934,7 +934,7 @@ void System::completeKeyword(int index) {
   }
 }
 
-void System::editSource(strlib::String loadPath) {
+void System::editSource(strlib::String loadPath, bool restoreOnExit) {
   logEntered();
 
   strlib::String fileName;
@@ -1119,7 +1119,7 @@ void System::editSource(strlib::String loadPath) {
 
   // deletes editWidget unless it has been removed
   _output->removeInputs();
-  if (!isClosing()) {
+  if (!isClosing() && restoreOnExit) {
     _output->selectScreen(prevScreenId);
   }
   logLeaving();

src/platform/sdl/editor.cpp

@@ -155,7 +155,7 @@ void exportBuffer(AnsiWidget *out, const char *text, String &dest, String &token
   out->setStatus(buffer);
 }
 
-void System::editSource(String loadPath) {
+void System::editSource(String loadPath, bool restoreOnExit) {
   logEntered();
 
   int w = _output->getWidth();
@@ -510,7 +510,7 @@ void System::editSource(String loadPath) {
 
   // deletes editWidget unless it has been removed
   _output->removeInputs();
-  if (!isClosing()) {
+  if (!isClosing() && restoreOnExit) {
     _output->selectScreen(prevScreenId, false);
   }
   logLeaving();

src/ui/system.cpp

@@ -581,7 +581,7 @@ void System::runEdit(const char *startupBas) {
   while (true) {
     if (loadSource(_loadPath)) {
       setupPath(_loadPath);
-      editSource(_loadPath);
+      editSource(_loadPath, false);
       if (isBack() || isClosing()) {
         break;
       } else {
@@ -656,7 +656,7 @@ void System::runMain(const char *mainBasPath) {
     }
 
     if (!_mainBas && isEditReady() && loadSource(_loadPath)) {
-      editSource(_loadPath);
+      editSource(_loadPath, true);
       if (isBack()) {
         _loadPath.clear();
         _state = kActiveState;

src/ui/system.h

@@ -71,7 +71,7 @@ struct System {
   virtual char *getClipboardText() = 0;
 
 protected:
-  void editSource(strlib::String loadPath);
+  void editSource(strlib::String loadPath, bool restoreOnExit);
   bool execute(const char *bas);
   bool fileExists(strlib::String &path);
   MAEvent getNextEvent() { return processEvents(1); }