Mercurial > hg > openttd
changeset 17582:2ab177f86c23 draft
(svn r22346) -Cleanup: Textbuf::max_pixels is not required anymore.
| author | terkhen <terkhen@openttd.org> |
|---|---|
| date | Sun, 17 Apr 2011 18:45:36 +0000 (2011-04-17) |
| parents | fcaf21b1f9fa |
| children | 8205b9d9fcf9 |
| files | src/misc_gui.cpp src/textbuf_gui.h |
| diffstat | 2 files changed, 1 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1042,7 +1042,7 @@ { const byte charwidth = GetCharacterWidth(FS_NORMAL, key); uint16 len = (uint16)Utf8CharLen(key); - if (tb->bytes + len <= tb->max_bytes && tb->chars + 1 <= tb->max_chars && (tb->max_pixels == 0 || tb->pixels + charwidth <= tb->max_pixels)) { + if (tb->bytes + len <= tb->max_bytes && tb->chars + 1 <= tb->max_chars) { memmove(tb->buf + tb->caretpos + len, tb->buf + tb->caretpos, tb->bytes - tb->caretpos); Utf8Encode(tb->buf + tb->caretpos, key); tb->chars++; @@ -1079,7 +1079,6 @@ if (tb->chars + chars + 1 > tb->max_chars) break; byte char_pixels = GetCharacterWidth(FS_NORMAL, c); - if (tb->max_pixels != 0 && pixels + tb->pixels + char_pixels > tb->max_pixels) break; pixels += char_pixels; bytes += len; @@ -1181,7 +1180,6 @@ tb->buf = buf; tb->max_bytes = max_bytes; tb->max_chars = max_chars; - tb->max_pixels = 0; tb->caret = true; UpdateTextBufferSize(tb); }
--- a/src/textbuf_gui.h +++ b/src/textbuf_gui.h @@ -22,7 +22,6 @@ char *buf; ///< buffer in which text is saved uint16 max_bytes; ///< the maximum size of the buffer in bytes (including terminating '\0') uint16 max_chars; ///< the maximum size of the buffer in characters (including terminating '\0') - uint16 max_pixels; ///< the maximum size of the buffer in pixels uint16 bytes; ///< the current size of the string in bytes (including terminating '\0') uint16 chars; ///< the current size of the string in characters (including terminating '\0') uint16 pixels; ///< the current size of the string in pixels