UI: fix editor layout

Author: chrisws

src/ui/image.cpp

@@ -122,6 +122,27 @@ ImageBuffer *load_image(var_t *map) {
   return result;
 }
 
+ImageBuffer *load_image(const unsigned char* buffer, int32_t size) {
+  ImageBuffer *result = NULL;
+  unsigned w, h;
+  unsigned char *image;
+  unsigned error = 0;
+
+  error = lodepng_decode32(&image, &w, &h, buffer, size);
+  if (!error) {
+    result = new ImageBuffer();
+    result->_bid = ++nextId;
+    result->_width = w;
+    result->_height = h;
+    result->_filename = NULL;
+    result->_image = image;
+    cache.add(result);
+  } else {
+    err_throw(ERR_IMAGE_LOAD, lodepng_error_text(error));
+  }
+  return result;
+}
+
 ImageBuffer *load_image(dev_file_t *filep) {
   ImageBuffer *result = NULL;
   List_each(ImageBuffer *, it, cache) {
@@ -424,14 +445,25 @@ extern "C" void v_create_image(var_p_t var) {
       strcpy(file.name, arg.v.p.ptr);
       file.type = ft_stream;
       image = load_image(&file);
-    } else if (arg.type == V_ARRAY && !prog_error) {
-      char **data = new char*[arg.v.a.size];
-      for (int i = 0; i < arg.v.a.size; i++) {
-        var_p_t elem = v_elem(&arg, i);
-        data[i] = elem->v.p.ptr;
+    } else if (arg.type == V_ARRAY && arg.v.a.size > 0 && !prog_error) {
+      var_p_t elem0 = v_elem(&arg, 0);
+      if (elem0->type == V_STR) {
+        char **data = new char*[arg.v.a.size];
+        for (int i = 0; i < arg.v.a.size; i++) {
+          var_p_t elem = v_elem(&arg, i);
+          data[i] = elem->v.p.ptr;
+        }
+        image = load_xpm_image(data);
+        delete [] data;
+      } else if (elem0->type == V_INT) {
+        unsigned char *data = new unsigned char[arg.v.a.size];
+        for (int i = 0; i < arg.v.a.size; i++) {
+          var_p_t elem = v_elem(&arg, i);
+          data[i] = (unsigned char)elem->v.i;
+        }
+        image = load_image(data, arg.v.a.size);
+        delete [] data;
       }
-      image = load_xpm_image(data);
-      delete [] data;
     } else {
       image = load_image(&arg);
     }

src/ui/inputs.h

@@ -116,6 +116,7 @@ struct FormInput : public Shape {
   virtual bool isDrawTop() { return false; }
   virtual bool hasHover() { return false; }
   virtual void setFocus(bool focus);
+  virtual void layout(int w, int h) {}
 
   void construct(var_p_t form, var_p_t field, int id);
   void drawButton(const char *caption, int x, int y, int w, int h, bool pressed);

src/ui/screen.cpp

@@ -248,6 +248,8 @@ void Screen::layoutInputs(int newWidth, int newHeight) {
       if (bottom) {
         r1->_height = newHeight - r1->_y;
       }
+    } else {
+      r1->layout(newWidth, newHeight);
     }
   }
 }

src/ui/textedit.h

@@ -106,7 +106,7 @@ struct TextEditInput : public FormEditInput {
   void selectAll();
   bool isDirty() { return _dirty && _state.undostate.undo_point > 0; }
   void setDirty(bool dirty) { _dirty = dirty; }
-  void resize(int w, int h) { _width = w; _height = h; }
+  void layout(int w, int h) { _width = w; _height = h; }
   const char *getNodeId();
   char *getWordBeforeCursor();
   bool replaceNext(const char *text);
@@ -198,7 +198,7 @@ struct TextEditHelpWidget : public TextEditInput {
   bool edit(int key, int screenWidth, int charWidth);
   void paste(const char *text) {}
   bool isDrawTop() { return true; }
-  void resize(int w, int h) { _x = w - _width; _height = h; }
+  void layout(int w, int h) { _x = w - _width; _height = h; }
   void reset(HelpMode mode);
   bool closeOnEnter() const;
   bool lineEditMode() const { return _mode == kLineEdit; }