ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed crash in StringListwidget when scrolling with mouse 

fixed #398
This commit is contained in:
thrust26 2018-12-15 10:17:14 +01:00
parent b8e53d76af
commit 06c20103af
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/ListWidget.hxx
View File

@ -58,6 +58,7 @@ class ListWidget : public EditableWidget
const string& getSelectedString() const; const string& getSelectedString() const;
void scrollTo(int item); void scrollTo(int item);
void scrollToEnd() { scrollToCurrent(int(_list.size())); }
// Account for the extra width of embedded scrollbar // Account for the extra width of embedded scrollbar
int getWidth() const override; int getWidth() const override;

1
src/gui/LoggerDialog.cxx
View File

@ -89,6 +89,7 @@ void LoggerDialog::loadConfig()
StringParser parser(instance().logMessages()); StringParser parser(instance().logMessages());
myLogInfo->setList(parser.stringList()); myLogInfo->setList(parser.stringList());
myLogInfo->setSelected(0); myLogInfo->setSelected(0);
myLogInfo->scrollToEnd();
myLogLevel->setSelected(instance().settings().getString("loglevel"), "1"); myLogLevel->setSelected(instance().settings().getString("loglevel"), "1");
myLogToConsole->setState(instance().settings().getBool("logtoconsole")); myLogToConsole->setState(instance().settings().getBool("logtoconsole"));

2
src/gui/StringListWidget.cxx
View File

@ -104,7 +104,7 @@ void StringListWidget::drawWidget(bool hilite)
GUI::Rect StringListWidget::getEditRect() const GUI::Rect StringListWidget::getEditRect() const
{ {
GUI::Rect r(2, 1, _w - 2, _fontHeight); GUI::Rect r(2, 1, _w - 2, _fontHeight);
const int offset = (_selectedItem - _currentPos) * _fontHeight; const int offset = std::max(0, (_selectedItem - _currentPos) * _fontHeight);
r.top += offset; r.top += offset;
r.bottom += offset; r.bottom += offset;