UI: fix label display issue

Author: chrisws

src/ui/ansiwidget.cpp

@@ -575,6 +575,7 @@ void AnsiWidget::drawActiveButton() {
   if (_focus != NULL && !_activeButton->hasHover()) {
     MAHandle currentHandle = maSetDrawTarget(HANDLE_SCREEN);
     _focus->drawShape(_activeButton);
+    _focus->drawLabel();
     maUpdateScreen();
     maSetDrawTarget(currentHandle);
   }

src/ui/screen.cpp

@@ -101,6 +101,29 @@ void Screen::clear() {
   _label.empty();
 }
 
+void Screen::drawLabel() {
+  if (_label.length()) {
+    MAExtent screenSize = maGetScrSize();
+    int screenW = EXTENT_X(screenSize);
+    int screenH = EXTENT_Y(screenSize);
+    int w = _charWidth * (_label.length() + 2);
+    int h = _charHeight + 2;
+    int top = screenH - h;
+    int left = (screenW - w) / 2;
+    int textY = top + ((h - _charHeight) / 2);
+
+    maSetColor(0xbfbfbf);
+    maFillRect(left, top, w, h);
+    maSetColor(0xe5e5e5);
+    maLine(left, top, left + w, top);
+    maSetColor(0x737373);
+    maLine(left, top + h - 1, left + w, top + h - 1);
+    maLine(left + w, top + 1, left + w, top + h - 1);
+    maSetColor(0x403c44);
+    maDrawText(left + _charWidth, textY, _label.c_str(), _label.length());
+  }
+}
+
 void Screen::drawShape(Shape *rect) {
   if (rect != NULL &&
       rect->_y >= _scrollY &&
@@ -164,27 +187,7 @@ void Screen::drawOverlay(bool vscroll) {
     }
   }
 
-  // display the label
-  if (_label.length()) {
-    MAExtent screenSize = maGetScrSize();
-    int screenW = EXTENT_X(screenSize);
-    int screenH = EXTENT_Y(screenSize);
-    int w = _charWidth * (_label.length() + 2);
-    int h = _charHeight + 2;
-    int top = screenH - h;
-    int left = (screenW - w) / 2;
-    int textY = top + ((h - _charHeight) / 2);
-
-    maSetColor(0xbfbfbf);
-    maFillRect(left, top, w, h);
-    maSetColor(0xe5e5e5);
-    maLine(left, top, left + w, top);
-    maSetColor(0x737373);
-    maLine(left, top + h - 1, left + w, top + h - 1);
-    maLine(left + w, top + 1, left + w, top + h - 1);
-    maSetColor(0x403c44);
-    maDrawText(left + _charWidth, textY, _label.c_str(), _label.length());
-  }
+  drawLabel();
 }
 
 void Screen::drawInto(bool background) {

src/ui/screen.h

@@ -50,6 +50,7 @@ struct Screen : public Shape {
   void add(Shape *button);
   void addImage(ImageDisplay &image);
   int  ansiToMosync(long c);
+  void drawLabel();
   void drawShape(Shape *button);
   void drawOverlay(bool vscroll);
   FormInput *getMenu(FormInput *prev, int px, int py);

src/ui/system.cpp

@@ -138,8 +138,7 @@ void System::editSource(strlib::String &loadPath) {
 
   while (_state == kEditState) {
     MAEvent event = getNextEvent();
-    if (event.type == EVENT_TYPE_KEY_PRESSED &&
-        _userScreenId == -1) {
+    if (event.type == EVENT_TYPE_KEY_PRESSED && _userScreenId == -1) {
       dev_clrkb();
       int sw = _output->getScreenWidth();
       bool redraw = true;
@@ -1105,7 +1104,7 @@ void System::scratchPad() {
   path = "/sdcard/";
 #endif
   char file[OS_PATHNAME_SIZE];
-  sprintf(file, "%suntitled.bas", path);
+  sprintf(file, "%sscratch.bas", path);
   bool ready = access(file, R_OK) == 0;
   if (!ready) {
     FILE *fp = fopen(file, "w");

src/ui/textedit.cpp

@@ -555,7 +555,9 @@ char *TextEditInput::copy(bool cut) {
 }
 
 void TextEditInput::paste(const char *text) {
-  stb_textedit_paste(&_buf, &_state, text, strlen(text));
+  if (text != NULL) {
+    stb_textedit_paste(&_buf, &_state, text, strlen(text));
+  }
 }
 
 void TextEditInput::layout(StbTexteditRow *row, int start) const {
@@ -699,7 +701,7 @@ void TextEditInput::editTab() {
   // get the current lines indent
   char *buf = lineText(start);
   int curIndent = 0;
-  while (buf && buf[curIndent] == ' ') {
+  while (buf && (buf[curIndent] == ' ' || buf[curIndent] == '\t')) {
     curIndent++;
   }