UI: fix colour handling

Author: chrisws

src/platform/android/app/src/main/assets/main.bas

@@ -7,7 +7,10 @@ const char_w = txtw(".")
 const lineSpacing = 2 + char_h
 const idxEdit = 6
 const idxFiles = 7
-const colGrey = rgb(100,100,100)
+const colGrey = rgb(100, 100, 100)
+const colBkGnd = rgb(31, 28, 31)
+const colText = 2
+const colLink = 3
 const menu_gap = -(char_w / 2)
 const is_sdl = instr(sbver, "SDL") != 0
 const onlineUrl = "http://smallbasic.github.io/samples/index.bas"
@@ -43,8 +46,7 @@ func mk_menu(value, lab, x)
   bn.y = ypos * char_h
   bn.value = value
   bn.label = "[" + lab + "]"
-  bn.color = 3
-  bn.backgroundColor = 0
+  bn.color = colLink
   bn.type = "link"
   mk_menu = bn
 end
@@ -84,8 +86,7 @@ sub do_okay_button(bn_extra)
   button.label = "[Close]"
   button.x = (xmax - txtw(button.label)) / 2
   button.y = ypos * char_h
-  button.backgroundColor = 0
-  button.color = 3
+  button.color = colLink
   button.type = "link"
   if (ismap(bn_extra)) then
     frm.inputs << bn_extra
@@ -96,9 +97,14 @@ sub do_okay_button(bn_extra)
   frm.doEvents()
 end
 
+sub clear_screen()
+  color colText, colBkGnd
+  cls
+end
+
 sub do_about()
   cls
-  color 2,0
+  color colText
   if (char_w * 45 < xmax) then
     print "   ____          _______  ___   _____________"
     print "  / ____ _ ___ _/ / / _ )/ _ | / __/  _/ ___/"
@@ -110,7 +116,7 @@ sub do_about()
     print "__)| | |(_||||_)/--\__)|\_"
   endif
   print
-  color 7,0
+  color 7
   print "Version "; sbver
   print
   print "Copyright (c) 2002-2018 Chris Warren-Smith"
@@ -122,26 +128,26 @@ sub do_about()
   bn_home.type = "link"
   bn_home.isExternal = true
   bn_home.label = "https://smallbasic.github.io"
-  bn_home.color = 3
+  bn_home.color = colLink
   print:print
 
-  color colGrey,0
+  color colGrey
   print "SmallBASIC comes with ABSOLUTELY NO WARRANTY. ";
   print "This program is free software; you can use it ";
   print "redistribute it and/or modify it under the terms of the ";
   print "GNU General Public License version 2 as published by ";
   print "the Free Software Foundation." + chr(10)
   print
-  color 7,0
+  color 7
   server_info()
   do_okay_button(bn_home)
-  cls
+  clear_screen()
 end
 
 sub do_setup()
   local frm
 
-  color 3, 0
+  color 3
   cls
   print boldOn + "Setup web service port number."
   print boldOff
@@ -163,7 +169,7 @@ sub do_setup()
     env("serverToken=" + token)
   endif
 
-  color 3, 0
+  color 3
   cls
   print "Web service port number: " + env("serverSocket")
   print
@@ -187,8 +193,7 @@ sub do_setup()
   local msg = "You must restart SmallBASIC for this change to take effect."
   local wnd = window()
   wnd.alert(msg, "Restart required")
-  color 7, 0
-  cls
+  clear_screen()
 end
 
 sub server_info()
@@ -422,7 +427,7 @@ sub manageFiles()
     bn_files.y = bn_edit.y + char_h + 2
     bn_files.height = ymax - bn_files.y
     bn_files.width = xmax - x1
-    bn_files.color = 2
+    bn_files.color = colText
     bn_files.type = "list"
     bn_files.resizable = TRUE
     bn_files.help = "No .bas files in " + cwd
@@ -508,13 +513,14 @@ sub manageFiles()
     else
       tload selectedFile, buffer
       wnd.graphicsScreen2()
+      color 7
       cls
-      color 7,0
       len_buffer = len(buffer) - 1
       for i = 0 to len_buffer
         print buffer(i)
       next i
       do_okay_button(nil)
+      clear_screen()
       wnd.graphicsScreen1()
       f.value = selectedFile
     endIf
@@ -649,6 +655,7 @@ sub main
     path = backPath
   end
 
+  clear_screen()
   path = cwd
   frm = makeUI(path, sortDir)
 

src/ui/system.cpp

@@ -537,8 +537,15 @@ char *System::readSource(const char *fileName) {
           buffer = (char *)malloc(len + 1);
           len = read(h, buffer, len);
           buffer[len] = '\0';
-          _activeFile = fileName;
-          _modifiedTime = getModifiedTime();
+          _modifiedTime = st.st_mtime;
+          char fullPath[PATH_MAX + 1];
+          char *path = realpath(fileName, fullPath);
+          if (path != NULL) {
+            // set full path for getModifiedTime()
+            _activeFile = fullPath;
+          } else {
+            _activeFile = fileName;
+          }
         }
         close(h);
       }

src/ui/textedit.cpp

@@ -978,11 +978,7 @@ void TextEditInput::updateField(var_p_t form) {
 bool TextEditInput::updateUI(var_p_t form, var_p_t field) {
   bool updated = (form && field) ? FormInput::updateUI(form, field) : false;
   if (!_theme) {
-    if (_fg == DEFAULT_FOREGROUND && _bg == DEFAULT_BACKGROUND) {
-      _theme = new EditTheme();
-    } else {
-      _theme = new EditTheme(_fg, _bg);
-    }
+    _theme = new EditTheme();
     updated = true;
   }
   return updated;

src/ui/utils.h

@@ -17,7 +17,7 @@
 #endif
 
 #define DEFAULT_FOREGROUND 0xa1a1a1
-#define DEFAULT_BACKGROUND 0x121212
+#define DEFAULT_BACKGROUND 0
 #define HANDLE_SCREEN_BUFFER HANDLE_SCREEN
 #define USER_MESSAGE_EXIT 1000