UI: fix textwidget layout handling

Author: chrisw-s

src/platform/android/jni/runtime.cpp

@@ -1071,7 +1071,7 @@ void System::editSource(strlib::String loadPath, bool restoreOnExit) {
         case SB_KEY_F(1):
           widget = helpWidget;
           helpWidget->createKeywordIndex();
-          helpWidget->show();
+          helpWidget->showPopup(-4, -2);
           helpWidget->setFocus(true);
           runtime->showKeypad(false);
           showStatus = false;

src/ui/screen.cpp

@@ -170,7 +170,6 @@ void Screen::drawOverlay(bool vscroll) {
   List_each(FormInput *, it, _inputs) {
     FormInput *input = (*it);
     if (input->_y >= _scrollY - _height &&
-        input->_y + input->_height <= _scrollY + _height &&
         input->isVisible()) {
       if (input->isDrawTop()) {
         drawTop = input;
@@ -286,35 +285,7 @@ FormInput *Screen::getNextMenu(FormInput *prev, bool up) {
 void Screen::layoutInputs(int newWidth, int newHeight) {
   List_each(FormInput *, it, _inputs) {
     FormInput *r1 = (*it);
-    if (r1->isResizable()) {
-      bool right = true;
-      bool bottom = true;
-      List_each(FormInput *, subIt, _inputs) {
-        FormInput *r2 = (*subIt);
-        if (r1 != r2) {
-          if (r2->_x >  r1->_x &&
-              r2->_y >= r1->_y &&
-              r2->_y <= r1->_y + _height) {
-            // cant resize over right side sibling
-            right = false;
-          }
-          if (r2->_y >  r1->_y &&
-              r2->_x >= r1->_x &&
-              r2->_x <= r1->_x + _width) {
-            // cant resize over lower side sibling
-            bottom = false;
-          }
-        }
-      }
-      if (right) {
-        r1->_width = newWidth - r1->_x;
-      }
-      if (bottom) {
-        r1->_height = newHeight - r1->_y;
-      }
-    } else {
-      r1->layout(newWidth, newHeight);
-    }
+    r1->layout(newWidth, newHeight);
   }
 }
 

src/ui/textedit.cpp

@@ -76,6 +76,7 @@ int textedit_move_to_word_next(EditBuffer *str, int c) {
 #define HELP_BG 0x20242a
 #define HELP_FG 0x73c990
 #define DOUBLE_CLICK_MS 200
+#define SIDE_BAR_WIDTH 30
 
 #if defined(_Win32)
 #include <shlwapi.h>
@@ -509,9 +510,12 @@ TextEditInput::TextEditInput(const char *text, int chW, int chH,
   _matchingBrace(-1),
   _ptY(-1),
   _pressTick(0),
+  _xmargin(0),
+  _ymargin(0),
   _bottom(false),
   _dirty(false) {
   stb_textedit_initialize_state(&_state, false);
+  _resizable = true;
 }
 
 TextEditInput::~TextEditInput() {
@@ -1107,8 +1111,8 @@ bool TextEditInput::updateUI(var_p_t form, var_p_t field) {
 }
 
 bool TextEditInput::selected(MAPoint2d pt, int scrollX, int scrollY, bool &redraw) {
-  bool result = FormEditInput::selected(pt, scrollX, scrollY, redraw);
-  if (hasFocus()) {
+  bool result = hasFocus() && FormEditInput::selected(pt, scrollX, scrollY, redraw);
+  if (result) {
     if (pt.x < _marginWidth) {
       dragPage(pt.y, redraw);
     } else {
@@ -1189,6 +1193,22 @@ void TextEditInput::layout(StbTexteditRow *row, int start) const {
   row->ymax = row->baseline_y_delta = _charHeight;
 }
 
+void TextEditInput::layout(int w, int h) {
+  if (_resizable) {
+    if (_height == _charHeight) {
+      _x = (w - _width) / 2;
+      _y = h - (_charHeight * 2.5);
+    } else if (_width == _charWidth * SIDE_BAR_WIDTH) {
+      int border = _charWidth * 2;
+      _height = h - (border * 2);
+      _x = w - (_width + border);
+    } else {
+      _width = w - (_x + _xmargin);
+      _height = h - (_y + _ymargin);
+    }
+  }
+}
+
 int TextEditInput::charWidth(int k, int i) const {
   int result = 0;
   if (k + i < _buf._len && _buf._buffer[k + i] != '\n') {
@@ -1197,6 +1217,12 @@ int TextEditInput::charWidth(int k, int i) const {
   return result;
 }
 
+void TextEditInput::calcMargin() {
+  MAExtent screenSize = maGetScrSize();
+  _xmargin = EXTENT_X(screenSize) - (_x + _width);
+  _ymargin = EXTENT_Y(screenSize) - (_y + _height);
+}
+
 void TextEditInput::changeCase() {
   int start, end;
   char *selection = getSelection(&start, &end);
@@ -2396,16 +2422,18 @@ void TextEditHelpWidget::showPopup(int cols, int rows) {
     _y = (_editor->_height - _height) / 2;
   }
   _theme->contrast(_editor->getTheme());
+  calcMargin();
   show();
 }
 
 void TextEditHelpWidget::showSidebar() {
   int border = _charWidth * 2;
-  _width = _charWidth * 30;
+  _width = _charWidth * SIDE_BAR_WIDTH;
   _height = _editor->_height - (border * 2);
   _x = _editor->_width - (_width + border);
   _y = border;
   _theme->contrast(_editor->getTheme());
+  calcMargin();
   show();
 }
 

src/ui/textedit.h

@@ -104,7 +104,7 @@ struct TextEditInput : public FormEditInput {
   void selectAll();
   bool isDirty() { return _dirty && _state.undostate.undo_point > 0; }
   void setDirty(bool dirty) { _dirty = dirty; }
-  void layout(int w, int h) { _width = w; _height = h; }
+  void layout(int w, int h);
   const char *getNodeId();
   char *getWordBeforeCursor();
   bool replaceNext(const char *text, bool skip);
@@ -124,6 +124,7 @@ struct TextEditInput : public FormEditInput {
 
   void dragPage(int y, bool &redraw);
   void drawText(int x, int y, const char *str, int length, SyntaxState &state);
+  void calcMargin();
   void changeCase();
   void cycleTheme();
   void drawLineNumber(int x, int y, int row, bool selected);
@@ -169,6 +170,8 @@ struct TextEditInput : public FormEditInput {
   int _matchingBrace;
   int _ptY;
   int _pressTick;
+  int _xmargin;
+  int _ymargin;
   bool _bottom;
   bool _dirty;
 };
@@ -208,7 +211,6 @@ struct TextEditHelpWidget : public TextEditInput {
   bool edit(int key, int screenWidth, int charWidth);
   void paste(const char *text);
   bool isDrawTop() { return true; }
-  void layout(int w, int h) { _x = w - _width; _height = h; }
   void reset(HelpMode mode);
   void cancelMode() { _mode = kNone; }
   bool closeOnEnter() const;