Ticket #8217: EditTextWidget_long.diff

newgui.h

@@ -135 +135 @@
         void drawChar(byte c, int x, int y, NewGuiColor color);
         int getStringWidth(const String &str);
         int getCharWidth(byte c);
-        void drawString(const String &str, int x, int y, int w, NewGuiColor color, int align = kTextAlignLeft);
+        void drawString(const String &str, int x, int y, int w, NewGuiColor color, int align = kTextAlignLeft, int deltax = 0);
 
         void blitFromBuffer(int x, int y, int w, int h, const byte *buf, int pitch);
         void blitToBuffer(int x, int y, int w, int h, byte *buf, int pitch);

newgui.cpp

@@ -429 +429 @@
         return guifont[c+6];
 }
 
-void NewGui::drawString(const String &str, int x, int y, int w, NewGuiColor color, int align) {
+void NewGui::drawString(const String &str, int x, int y, int w, NewGuiColor color, int align, int deltax) {
         const int leftX = x, rightX = x + w;
         int width = getStringWidth(str);
         if (align == kTextAlignCenter)
                 x = x + (w - width - 1)/2;
         else if (align == kTextAlignRight)
                 x = x + w - width;
+        x += deltax;
 
         for (int i = 0; i < str.size(); ++i) {
                 w = getCharWidth(str[i]);

EditTextWidget.h

@@ -34 +34 @@
         bool                    _caretVisible;
         uint32          _caretTime;
         int                             _pos;
+        int                             _labelOffset;
 public:
         EditTextWidget(Dialog *boss, int x, int y, int w, int h, const String &text);
 
@@ -47 +48 @@
         void drawWidget(bool hilite);
         void drawCaret(bool erase);
         void lostFocusWidget() { _backupString = _label; drawCaret(true); }
+
+        int getCaretPos();
+        bool adjustOffset();
 };
 
 #endif