luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-12 16:15:20 +02:00
Code Activity

Formspec: Fix newline conversion on Windows (#16311)

Browse Source 
Strings with CR+LF (\r+\n) were wrongly fixed into \r, which is enough to display them correctly, but the missing \n became important once the text was saved/reloaded.

By removing the \r instead of the \n, then the text is displayed correctly and saved correctly.
This commit is contained in:
Lucas OH
2025-07-06 22:10:51 +02:00
committed by GitHub
parent 2a8ee686d9
commit 51a453ca7b
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
irr/src/CGUIEditBox.cpp
View File

@@ -1104,10 +1104,7 @@ void CGUIEditBox::breakText()
lineBreak = true;
c = 0;
if (Text[i + 1] == L'\n') { // Windows breaks
// TODO: I (Michael) think that we shouldn't change the text given by the user for whatever reason.
// Instead rework the cursor positioning to be able to handle this (but not in stable release
// branch as users might already expect this behavior).
Text.erase(i + 1);
Text.erase(i);
--size;
if (CursorPos > i)
--CursorPos;

5
src/gui/guiEditBoxWithScrollbar.cpp
View File

@@ -337,10 +337,7 @@ void GUIEditBoxWithScrollBar::breakText()
line_break = true;
c = 0;
if (Text[i + 1] == L'\n') { // Windows breaks
// TODO: I (Michael) think that we shouldn't change the text given by the user for whatever reason.
// Instead rework the cursor positioning to be able to handle this (but not in stable release
// branch as users might already expect this behavior).
Text.erase(i + 1);
Text.erase(i);
--size;
if (m_cursor_pos > i)
--m_cursor_pos;