Revert "GUI: Ensure that all keymap widgets fit within the scroll container"

This reverts commit d255fbe671f6d5f7effa99988131dd92845b8b5b.
This commit is contained in:
Cameron Cawley 2022-12-25 23:17:11 +00:00 committed by Eugene Sandulenko
parent 22a21e99cc
commit 30bdbb6f76

View File

@ -104,7 +104,7 @@ void RemapWidget::reflowActionWidgets() {
int spacing = g_gui.xmlEval()->getVar("Globals.KeyMapper.Spacing");
int keyButtonWidth = g_gui.xmlEval()->getVar("Globals.KeyMapper.ButtonWidth");
int resetButtonWidth = g_gui.xmlEval()->getVar("Globals.KeyMapper.ResetWidth");
int labelWidth = widgetsBoss()->getWidth() - (spacing + keyButtonWidth + spacing);
int labelWidth = getWidth() - (spacing + keyButtonWidth + spacing);
labelWidth = MAX(0, labelWidth);
uint textYOff = (buttonHeight - kLineHeight) / 2;
@ -121,7 +121,7 @@ void RemapWidget::reflowActionWidgets() {
// Insert a keymap separator
uint descriptionX = 2 * spacing + keyButtonWidth;
uint resetX = widgetsBoss()->getWidth() - spacing - resetButtonWidth;
uint resetX = getWidth() - spacing - resetButtonWidth;
KeymapTitleRow keymapTitle = _keymapSeparators[row.keymap];
if (keymapTitle.descriptionText) {