ANDROID: clip handling for drawlink

Author: chrisws

src/platform/common/ansiwidget.cpp

@@ -138,11 +138,25 @@ void Widget::drawButton(const char *caption, int dx, int dy,
   }
 }
 
-void Widget::drawLink(const char *caption, int dx, int dy) {
+void Widget::drawLink(const char *caption, int dx, int dy, int sw, int chw) {
   maSetColor(_fg);
-  maDrawText(dx, dy, caption);
+
+  int len = strlen(caption);
+  int width = min(sw, _width) - dx;
+  if ((len * chw) > sw - width) {
+    int len = width / chw;
+    char *buffer = new char[len + 1];
+    strncpy(buffer, caption, len - 2);
+    buffer[len - 2] = '~';
+    buffer[len - 1] = '~';
+    buffer[len] = 0;
+    maDrawText(dx, dy, buffer);
+    delete [] buffer;
+  } else {
+    maDrawText(dx, dy, caption);
+  }
   maSetColor(_pressed ? _fg : _bg);
-  maLine(dx + 2, dy + _height + 1, dx + _width, dy + _height + 1);
+  maLine(dx + 2, dy + _height - 1, dx + min(sw, _width), dy + _height - 1);
 }
 
 bool Widget::overlaps(MAPoint2d pt, int offsX, int offsY, bool &redraw) {
@@ -218,7 +232,7 @@ FormLineInput::FormLineInput(Screen *screen, char *buffer, int maxSize,
   _scroll(0) {
 }
 
-void FormLineInput::draw(int dx, int dy) {
+void FormLineInput::draw(int dx, int dy, int sw, int chw) {
   maSetColor(getBackground(GRAY_BG_COL));
   maFillRect(dx, dy, _width, _height);
   maSetColor(_fg);
@@ -856,11 +870,11 @@ Widget *AnsiWidget::createLink(const char *action, const char *text,
     _back->_linePadding = BUTTON_PADDING;
   }
   if (_back->_curX + w >= _width) {
-    w = _width - _back->_curX; // clipped
-    _back->newLine(EXTENT_Y(textSize) + LINE_SPACING);
-  } else {
-    _back->_curX += w;
+    // clipped
+    w = _width - _back->_curX - BUTTON_PADDING;
   }
+  _back->_curX += w;
+
   Widget *result;
   if (formLink) {
     result = new FormLink(_back, action, x, y, w, h);
@@ -986,7 +1000,7 @@ void AnsiWidget::drawActiveButton() {
   int x = _focus->_x + _activeButton->_x;
   int y = _focus->_y + _activeButton->_y - _focus->_scrollY;
   maSetClipRect(x, y, _activeButton->_width, _activeButton->_height + 2);
-  _activeButton->draw(x, y);
+  _activeButton->draw(x, y, _front->w(), _front->_charWidth);
   maUpdateScreen();
   maResetBacklight();
   maSetDrawTarget(currentHandle);

src/platform/common/ansiwidget.h

@@ -4,7 +4,7 @@
 //
 // This program is distributed under the terms of the GPL v2.0 or later
 // Download the GNU Public License (GPL) from www.gnu.org
-// 
+//
 
 #ifndef ANSIWIDGET_H
 #define ANSIWIDGET_H
@@ -37,7 +37,7 @@ struct Widget : public Shape {
   virtual void clicked(IButtonListener *listener, int x, int y) = 0;
   virtual bool overlaps(MAPoint2d pt, int scrollX, int scrollY, bool &redraw);
   void drawButton(const char *caption, int x, int y, int w, int h, bool pressed);
-  void drawLink(const char *caption, int x, int y);
+  void drawLink(const char *caption, int x, int y, int sw, int chw);
   int getBackground(int buttonColor);
 
   bool _pressed;
@@ -60,16 +60,18 @@ struct TextButton : public Button {
   TextButton(Screen *screen, const char *action, const char *label,
              int x, int y, int w, int h) :
   Button(screen, action, label, x, y, w, h) {}
-  void draw(int x, int y) { drawLink(_label.c_str(), x, y); }
+  void draw(int x, int y, int bw, int cw) {
+    drawLink(_label.c_str(), x, y, bw, cw);
+  }
 };
 
 // internal block button
 struct BlockButton : public Button {
   BlockButton(Screen *screen, const char *action, const char *label,
               int x, int y, int w, int h) :
   Button(screen, action, label, x, y, w, h) {}
-  void draw(int x, int y) { 
-    drawButton(_label.c_str(), x, y, _width, _height, _pressed); 
+  void draw(int x, int y, int bw, int cw) {
+    drawButton(_label.c_str(), x, y, _width, _height, _pressed);
   }
 };
 
@@ -105,8 +107,8 @@ struct FormButton : public FormWidget {
   virtual ~FormButton() {}
 
   const char *getText() const { return _caption.c_str(); }
-  void draw(int x, int y) { 
-    drawButton(_caption.c_str(), x, y, _width, _height, _pressed); 
+  void draw(int x, int y, int sw, int chw) {
+    drawButton(_caption.c_str(), x, y, _width, _height, _pressed);
   }
   void clicked(IButtonListener *listener, int x, int y);
   void setText(const char *text) { _caption = text; }
@@ -120,7 +122,7 @@ struct FormLabel : public FormWidget {
   virtual ~FormLabel() {}
 
   const char *getText() const { return _caption.c_str(); }
-  void draw(int x, int y) { 
+  void draw(int x, int y, int sw, int chw) {
     drawButton(_caption.c_str(), x, y, _width, _height, false);
   }
   void setText(const char *text) { _caption = text; }
@@ -134,19 +136,21 @@ struct FormLink : public FormWidget {
   virtual ~FormLink() {}
 
   const char *getText() const { return _link.c_str(); }
-  void draw(int x, int y) { drawLink(_link.c_str(), x, y); }
+  void draw(int x, int y, int sw, int chw) {
+    drawLink(_link.c_str(), x, y, sw, chw);
+  }
 
 private:
   String _link;
 };
 
 struct FormLineInput : public FormWidget {
-  FormLineInput(Screen *screen, char *buffer, int maxSize, 
+  FormLineInput(Screen *screen, char *buffer, int maxSize,
                 int x, int y, int w, int h);
   virtual ~FormLineInput() {}
 
   void close();
-  void draw(int x, int y);
+  void draw(int x, int y, int sw, int chw);
   bool edit(int key);
   const char *getText() const { return _buffer; }
   void setText(const char *text) {}
@@ -158,7 +162,7 @@ struct FormLineInput : public FormWidget {
 };
 
 struct FormList : public FormWidget {
-  FormList(Screen *screen, IFormWidgetListModel *model, 
+  FormList(Screen *screen, IFormWidgetListModel *model,
            int x, int y, int w, int h);
   virtual ~FormList() {}
 
@@ -173,7 +177,7 @@ struct FormList : public FormWidget {
 };
 
 struct FormDropList : public FormList {
-  FormDropList(Screen *screen, IFormWidgetListModel *model, 
+  FormDropList(Screen *screen, IFormWidgetListModel *model,
                int x, int y, int w, int h);
   void clicked(IButtonListener *listener, int x, int y);
   void draw(int dx, int dy);
@@ -189,7 +193,7 @@ struct FormDropList : public FormList {
 };
 
 struct FormListBox : public FormList {
-  FormListBox(Screen *screen, IFormWidgetListModel *model, 
+  FormListBox(Screen *screen, IFormWidgetListModel *model,
               int x, int y, int w, int h);
   void clicked(IButtonListener *listener, int x, int y);
   void draw(int dx, int dy);
@@ -264,7 +268,7 @@ struct AnsiWidget {
 
   Screen *_screens[MAX_SCREENS];
   Screen *_back;   // screen being painted/written
-  Screen *_front;  // screen to display 
+  Screen *_front;  // screen to display
   Screen *_focus;  // screen with the active button
   int _width;      // device screen width
   int _height;     // device screen height

src/platform/common/screen.cpp

@@ -128,7 +128,7 @@ void Screen::drawOverlay(bool vscroll) {
     Shape *rect = (*it);
     if (rect->_y >= _scrollY && 
         rect->_y + rect->_height <= _scrollY + _height) {
-      rect->draw(_x + rect->_x, _y + rect->_y - _scrollY);
+      rect->draw(_x + rect->_x, _y + rect->_y - _scrollY, w(), _charWidth);
     }
   }
 

src/platform/common/screen.h

@@ -34,7 +34,7 @@ using namespace strlib;
 struct Shape {
   Shape(int x, int y, int w, int h) : _x(x), _y(y), _width(w), _height(h) {}
   virtual ~Shape() {}
-  virtual void draw(int x, int y) {}
+  virtual void draw(int x, int y, int bw, int cw) {}
 
   int w() { return _width; }
   int h() { return _height; }