diff options
| author | terkhen <terkhen@openttd.org> | 2011-04-17 18:45:36 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-04-17 18:45:36 +0000 |
| commit | 8bc9925ade79d963ee363cbe7aabbfbe2266113c (patch) | |
| tree | 4b093fda7706e4230675d15be56458b4112f8f34 /src | |
| parent | 5bb7a48cd23a61ed523d09a5884848aa94e47da6 (diff) | |
| download | openttd-8bc9925ade79d963ee363cbe7aabbfbe2266113c.tar.xz | |
(svn r22346) -Cleanup: Textbuf::max_pixels is not required anymore.
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc_gui.cpp | 4 | ||||
| -rw-r--r-- | src/textbuf_gui.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index a3954a913..e0e29c050 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -1042,7 +1042,7 @@ bool InsertTextBufferChar(Textbuf *tb, WChar key) { 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 @@ bool InsertTextBufferClipboard(Textbuf *tb) 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 @@ void InitializeTextBuffer(Textbuf *tb, char *buf, uint16 max_bytes, uint16 max_c tb->buf = buf; tb->max_bytes = max_bytes; tb->max_chars = max_chars; - tb->max_pixels = 0; tb->caret = true; UpdateTextBufferSize(tb); } diff --git a/src/textbuf_gui.h b/src/textbuf_gui.h index a96fe9106..2723fd906 100644 --- a/src/textbuf_gui.h +++ b/src/textbuf_gui.h @@ -22,7 +22,6 @@ struct Textbuf { 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 |