[Scummvm-git-logs] scummvm master -> 1f51f4b8d6b6390ed45edcd57d37698f6ae9946f

[OMGPizzaGuy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1f51f4b8d6 ULTIMA8: Trim long descriptions in original saveload gump to fit


Commit: 1f51f4b8d6b6390ed45edcd57d37698f6ae9946f
    https://github.com/scummvm/scummvm/commit/1f51f4b8d6b6390ed45edcd57d37698f6ae9946f
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2023-10-15T13:26:33-05:00

Commit Message:
ULTIMA8: Trim long descriptions in original saveload gump to fit

Changed paths:
    engines/ultima/ultima8/gumps/u8_save_gump.cpp
    engines/ultima/ultima8/gumps/widgets/edit_widget.cpp


diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index f5ac77a0976..44a67190d95 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -139,7 +139,7 @@ void U8SaveGump::InitGump(Gump *newparent, bool take_focus) {
 				// load
 				Gump *widget = new TextWidget(xbase, entryheight + 4 + 40 * yi,
 				                              _descriptions[i], true, entryfont,
-				                              95);
+											  95, 38 - entryheight);
 				widget->InitGump(this, false);
 			}
 		}
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index 435477ca694..ffb95687179 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -148,6 +148,12 @@ void EditWidget::renderText() {
 		                               max_width, max_height,
 		                               Font::TEXT_LEFT,
 		                               false, cv ? _cursor : Std::string::npos);
+
+		// Trim text to fit
+		if (remaining < _text.length()) {
+			_text.resize(remaining);
+			_cursor = _text.size();
+		}
 	}
 }