SDL: fix editor layout resize handling

Author: chrisws

src/ui/textedit.cpp

@@ -1195,17 +1195,8 @@ void TextEditInput::layout(StbTexteditRow *row, int start) const {
 
 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);
-    }
+    _width = w - (_x + _xmargin);
+    _height = h - (_y + _ymargin);
   }
 }
 
@@ -1932,7 +1923,8 @@ TextEditHelpWidget::TextEditHelpWidget(TextEditInput *editor, int chW, int chH,
   _mode(kNone),
   _editor(editor),
   _openPackage(nullptr),
-  _openKeyword(-1) {
+  _openKeyword(-1),
+  _layout(kPopup) {
   _theme = new EditTheme(HELP_FG, HELP_BG);
   hide();
   if (overlay) {
@@ -2417,8 +2409,10 @@ void TextEditHelpWidget::showPopup(int cols, int rows) {
   }
   _x = (_editor->_width - _width) / 2;
   if (rows == 1) {
+    _layout = kLine;
     _y = _editor->_height - (_charHeight * 2.5);
   } else {
+    _layout = kPopup;
     _y = (_editor->_height - _height) / 2;
   }
   _theme->contrast(_editor->getTheme());
@@ -2433,6 +2427,7 @@ void TextEditHelpWidget::showSidebar() {
   _x = _editor->_width - (_width + border);
   _y = border;
   _theme->contrast(_editor->getTheme());
+  _layout = kSidebar;
   calcMargin();
   show();
 }
@@ -2446,3 +2441,23 @@ void TextEditHelpWidget::draw(int x, int y, int w, int h, int chw) {
   maFillRect(x + _width, y + shadowH, shadowW, _height);
   maFillRect(x + shadowW, y + _height, _width, shadowH);
 }
+
+void TextEditHelpWidget::layout(int w, int h) {
+  if (_resizable) {
+    int border;
+    switch (_layout) {
+    case kLine:
+      _x = (w - _width) / 2;
+      _y = h - (_charHeight * 2.5);
+      break;
+    case kSidebar:
+      border = _charWidth * 2;
+      _height = h - (border * 2);
+      _x = w - (_width + border);
+      break;
+    case kPopup:
+      _width = w - (_x + _xmargin);
+      _height = h - (_y + _ymargin);
+    }
+  }
+}

src/ui/textedit.h

@@ -215,6 +215,7 @@ struct TextEditHelpWidget : public TextEditInput {
   void cancelMode() { _mode = kNone; }
   bool closeOnEnter() const;
   bool searchMode() const { return _mode >= kSearch && _mode <= kReplaceDone; }
+  void layout(int w, int h);
   bool lineEditMode() const { return _mode == kLineEdit; }
   bool messageMode() const { return _mode == kMessage; }
   bool replaceMode() const { return _mode == kReplace; }
@@ -235,6 +236,11 @@ struct TextEditHelpWidget : public TextEditInput {
   TextEditInput *_editor;
   const char *_openPackage;
   int _openKeyword;
+  enum Layout {
+    kLine,
+    kSidebar,
+    kPopup,
+  } _layout;
 };
 
 #define STB_TEXTEDIT_STRING       EditBuffer