Ticket #8510: listwidget.diff

gui/ListWidget.cpp

@@ -55 +55 @@
 
         // FIXME: This flag should come from widget definition
         _editable = true;
+
+        _textWidth = new int[_entriesPerPage];
+
+        for (int i = 0; i < _entriesPerPage; i++)
+                _textWidth[i] = 0;
 }
 
 ListWidget::~ListWidget() {
+        delete[] _textWidth;
 }
 
 void ListWidget::setSelected(int item) {
@@ -319 +325 @@
                                 g_gui.theme()->drawWidgetBackground(Common::Rect(_x, _y + 1 + kLineHeight * i, _x+_w-1, y+fontHeight-1), _hints, Theme::kWidgetBackgroundBorderSmall);
                 }
 
+                Common::Rect r(getEditRect());
+
                 // If in numbering mode, we first print a number prefix
                 if (_numberingMode != kListNumberingOff) {
                         char temp[10];
                         sprintf(temp, "%2d. ", (pos + _numberingMode));
                         buffer = temp;
-                        g_gui.theme()->drawText(Common::Rect(_x+2, y, _x+_w-2, y+fontHeight-1), buffer, Theme::kStateEnabled, Theme::kTextAlignLeft, inverted);
+                        g_gui.theme()->drawText(Common::Rect(_x+2, y, _x+r.left, y+fontHeight-1), buffer, Theme::kStateEnabled, Theme::kTextAlignLeft, inverted);
                 }
 
-                Common::Rect r(getEditRect());
-                if (_selectedItem == pos && _editMode) {
+                int maxWidth = _textWidth[i];
+                int width;
 
+                if (_selectedItem == pos && _editMode) {
                         buffer = _editString;
                         adjustOffset();
                         deltax = -_editScrollOffset;
 
-                        g_gui.theme()->drawText(Common::Rect(_x + r.left - deltax, y, _x+_w-2, y+fontHeight-1), buffer, Theme::kStateEnabled, Theme::kTextAlignLeft, inverted);
+                        width = g_gui.getStringWidth(buffer);
+                        if (width > maxWidth)
+                                maxWidth = width;
+
+                        g_gui.theme()->drawText(Common::Rect(_x + r.left - deltax, y, _x + r.left - deltax + maxWidth, y + fontHeight - 1), buffer, Theme::kStateEnabled, Theme::kTextAlignLeft, inverted);
                 } else {
                         buffer = _list[pos];
                         deltax = 0;
-                        g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x+_w-2, y+fontHeight-1), buffer, Theme::kStateEnabled, Theme::kTextAlignLeft, inverted);
+
+                        width = g_gui.getStringWidth(buffer);
+                        if (width > maxWidth)
+                                maxWidth = width;
+
+                        g_gui.theme()->drawText(Common::Rect(_x + r.left, y, _x + r.left + maxWidth, y + fontHeight - 1), buffer, Theme::kStateEnabled, Theme::kTextAlignLeft, inverted);
                 }
+
+                _textWidth[i] = maxWidth;
         }
 }
 

gui/ListWidget.h

@@ -100 +100 @@
 
         void lostFocusWidget();
         void scrollToCurrent();
+
+        int *_textWidth;
 };
 
 } // End of namespace GUI