dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7700) -Fix (r7182): the caret 'randomly' jumped back and forth when getting a new randomised seed in the Generation World GUI.

Browse Source
This commit is contained in:
rubidium
2006-12-31 14:34:26 +00:00
parent b4fe2f268b
commit 5259540d02
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
misc_gui.c
View File

@@ -942,12 +942,13 @@ void UpdateTextBufferSize(Textbuf *tb)
WChar c = Utf8Consume(&buf); WChar c = Utf8Consume(&buf);
tb->width = 0; tb->width = 0;
tb->length = 0;
for (; c != '\0' && tb->length < (tb->maxlength - 1); c = Utf8Consume(&buf)) { for (; c != '\0' && tb->length < (tb->maxlength - 1); c = Utf8Consume(&buf)) {
tb->width += GetCharacterWidth(FS_NORMAL, c); tb->width += GetCharacterWidth(FS_NORMAL, c);
tb->length += Utf8CharLen(c);
} }
tb->length = buf - tb->buf - 1;
tb->caretpos = tb->length; tb->caretpos = tb->length;
tb->caretxoffs = tb->width; tb->caretxoffs = tb->width;
} }

6
window.h
View File

@@ -284,10 +284,10 @@ enum WindowDefaultPosition {
typedef struct Textbuf { typedef struct Textbuf {
char *buf; /* buffer in which text is saved */ char *buf; /* buffer in which text is saved */
uint16 maxlength, maxwidth; /* the maximum size of the buffer. Maxwidth specifies screensize in pixels */ uint16 maxlength, maxwidth; /* the maximum size of the buffer. Maxwidth specifies screensize in pixels, maxlength is in bytes */
uint16 length, width; /* the current size of the string. Width specifies screensize in pixels */ uint16 length, width; /* the current size of the string. Width specifies screensize in pixels, length is in bytes */
bool caret; /* is the caret ("_") visible or not */ bool caret; /* is the caret ("_") visible or not */
uint16 caretpos; /* the current position of the caret in the buffer */ uint16 caretpos; /* the current position of the caret in the buffer, in bytes */
uint16 caretxoffs; /* the current position of the caret in pixels */ uint16 caretxoffs; /* the current position of the caret in pixels */
} Textbuf; } Textbuf;