[Scummvm-git-logs] scummvm master -> 238670f3cde73f7aa7f0cfe2e9a95d4d034a182c

[sev-]

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:
238670f3cd GUI: Fix indentation in GroupedListWidget with monospaced fonts


Commit: 238670f3cde73f7aa7f0cfe2e9a95d4d034a182c
    https://github.com/scummvm/scummvm/commit/238670f3cde73f7aa7f0cfe2e9a95d4d034a182c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2023-07-22T12:50:31+02:00

Commit Message:
GUI: Fix indentation in GroupedListWidget with monospaced fonts

Changed paths:
    gui/widgets/groupedlist.cpp


diff --git a/gui/widgets/groupedlist.cpp b/gui/widgets/groupedlist.cpp
index 3b334f10ee9..e3ff7b58e0f 100644
--- a/gui/widgets/groupedlist.cpp
+++ b/gui/widgets/groupedlist.cpp
@@ -135,7 +135,7 @@ void GroupedListWidget::sortGroups() {
 
 		if (_groupExpanded[groupID]) {
 			for (int *k = _itemsInGroup[groupID].begin(); k != _itemsInGroup[groupID].end(); ++k) {
-				_list.push_back(Common::U32String(_groupsVisible ? "    " : "") + _dataList[*k].orig);
+				_list.push_back(_dataList[*k].orig);
 				_listIndex.push_back(*k);
 			}
 		}
@@ -332,6 +332,10 @@ void GroupedListWidget::drawWidget() {
 			r.left += fontHeight + _leftPadding;
 			g_gui.theme()->drawFoldIndicator(Common::Rect(_x + _hlLeftPadding + _leftPadding, y, _x + fontHeight + _leftPadding, y + fontHeight), _groupExpanded[groupID]);
 			pad = 0;
+		} else if (_groupsVisible) {
+			r.left += fontHeight + _leftPadding;
+			r.right -= _rightPadding;
+			pad = 0;
 		}
 
 		// If in numbering mode & not in RTL based GUI, we first print a number prefix