Fix text input cursor setting for multi-line text input with many spa…

…ces at the line end (#9319)
ihhub · Dec 12, 2024 · 1265680 · 1265680
1 parent 23aedf7
commit 1265680
Show file tree

Hide file tree

Showing 6 changed files with 297 additions and 288 deletions.
diff --git a/src/fheroes2/dialog/dialog_selectcount.cpp b/src/fheroes2/dialog/dialog_selectcount.cpp
@@ -210,8 +210,9 @@ bool Dialog::inputString( const fheroes2::TextBase & title, const fheroes2::Text
     bool isCursorVisible = true;
     const fheroes2::FontType fontType( fheroes2::FontType::normalWhite() );
     fheroes2::Text text( insertCharToString( result, charInsertPos, isCursorVisible ? '_' : '\x7F' ), fontType, textLanguage );
+    text.keepLineTrailingSpaces();
     if ( !isMultiLine ) {
-        text.fitToOneRow( textInputArea.width, false );
+        text.fitToOneRow( textInputArea.width );
     }
     text.drawInRoi( textInputArea.x, textInputArea.y + 2, textInputArea.width, display, textInputArea );
 
@@ -343,7 +344,7 @@ bool Dialog::inputString( const fheroes2::TextBase & title, const fheroes2::Text
             text.set( insertCharToString( result, charInsertPos, isCursorVisible ? '_' : '\x7F' ), fontType, textLanguage );
 
             if ( !isMultiLine ) {
-                text.fitToOneRow( textInputArea.width, false );
+                text.fitToOneRow( textInputArea.width );
             }
 
             textBackground.restore();

diff --git a/src/fheroes2/dialog/dialog_selectfile.cpp b/src/fheroes2/dialog/dialog_selectfile.cpp
@@ -112,7 +112,8 @@ namespace
 
         fheroes2::Text currentFilename( filename, isEditing ? fheroes2::FontType::normalWhite() : fheroes2::FontType::normalYellow() );
         // Do not ignore spaces at the end.
-        currentFilename.fitToOneRow( maxFileNameWidth, false );
+        currentFilename.keepLineTrailingSpaces();
+        currentFilename.fitToOneRow( maxFileNameWidth );
 
         currentFilename.draw( field.x + 4 + ( maxFileNameWidth - currentFilename.width() ) / 2, field.y + 4, display );
     }
@@ -198,7 +199,8 @@ namespace
         dsty += 2;
 
         fheroes2::Text text{ std::move( savname ), font };
-        text.fitToOneRow( maxFileNameWidth, false );
+        text.keepLineTrailingSpaces();
+        text.fitToOneRow( maxFileNameWidth );
         text.draw( dstx + 4 + ( maxFileNameWidth - text.width() ) / 2, dsty, display );
 
         redrawDateTime( display, info.timestamp, dstx + maxFileNameWidth + 9, dsty, font );