libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 08:55:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

GUI: Fix invalid rect when list width goes too small

Browse Source
This commit is contained in:
Le Philousophe 2021-06-20 13:33:38 +02:00
parent 087eb6005c
commit aa9cbdc6ab
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui/widgets/list.cpp
View File

@ -610,7 +610,12 @@ void ListWidget::drawWidget() {
Common::Rect ListWidget::getEditRect() const {
const int scrollbarW = (_scrollBar && _scrollBar->isVisible()) ? _scrollBarWidth : 0;
Common::Rect r(_hlLeftPadding, 0, _w - _hlRightPadding - scrollbarW, kLineHeight - 2);
int editWidth = _w - _hlLeftPadding - _hlRightPadding - scrollbarW;
// Ensure r will always be a valid rect
if (editWidth < 0) {
editWidth = 0;
}
Common::Rect r(_hlLeftPadding, 0, _hlLeftPadding + editWidth, kLineHeight - 2);
const int offset = (_selectedItem - _currentPos) * kLineHeight + _topPadding;
r.top += offset;
r.bottom += offset;
@ -619,6 +624,10 @@ Common::Rect ListWidget::getEditRect() const {
// FIXME: Assumes that all digits have the same width.
Common::String temp = Common::String::format("%2d. ", (_list.size() - 1 + _numberingMode));
r.left += g_gui.getStringWidth(temp) + _leftPadding;
// Make sure we don't go farther than right
if (r.right < r.left) {
r.right = r.left;
}
}
return r;