Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix text truncation in Win32 help dialog

Browse Source
This commit is contained in:
Jonathan G Rennison 2024-07-03 22:04:39 +01:00
parent dcd4295d4e
commit ae516b4a86
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/os/windows/win32.cpp
View File

@ -301,31 +301,34 @@ void CreateConsole()
}
/** Temporary pointer to get the help message to the window */
static const char *_help_msg;
static std::string_view _help_msg;
/** Callback function to handle the window */
static INT_PTR CALLBACK HelpDialogFunc(HWND wnd, UINT msg, WPARAM wParam, LPARAM)
{
switch (msg) {
case WM_INITDIALOG: {
char help_msg[8192];
const char *p = _help_msg;
char *q = help_msg;
while (q != lastof(help_msg) && *p != '\0') {
if (*p == '\n') {
const size_t help_msg_size = 1 + _help_msg.size() + std::count(_help_msg.begin(), _help_msg.end(), '\n');
auto help_msg = std::make_unique<char[]>(help_msg_size);
char *q = help_msg.get();
char *last = q + help_msg_size - 1;
for (char c : _help_msg) {
if (q == last) break;
if (c == '\n') {
*q++ = '\r';
if (q == lastof(help_msg)) {
if (q == last) {
q[-1] = '\0';
break;
}
}
*q++ = *p++;
*q++ = c;
}
*q = '\0';
*q++ = '\0';
/* We need to put the text in a separate buffer because the default
* buffer in OTTD2FS might not be large enough (512 chars). */
wchar_t help_msg_buf[8192];
SetDlgItemText(wnd, 11, convert_to_fs(help_msg, help_msg_buf, lengthof(help_msg_buf)));
const size_t help_msg_buf_size = ((q - help_msg.get()) * 3) / 2;
auto help_msg_buf = std::make_unique<wchar_t[]>(help_msg_buf_size);
SetDlgItemText(wnd, 11, convert_to_fs(help_msg.get(), help_msg_buf.get(), help_msg_buf_size));
SendDlgItemMessage(wnd, 11, WM_SETFONT, (WPARAM)GetStockObject(ANSI_FIXED_FONT), FALSE);
} return TRUE;