thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug #620854 (launcher crash)

Browse source 
svn-id: r5116
This commit is contained in:
Max Horn 2002-10-09 19:32:54 +00:00
parent 0c5b62b2e4
commit 06d5fe86f5
1 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gui/ScrollBarWidget.cpp
View file

@ -75,7 +75,7 @@ void ScrollBarWidget::handleMouseDown(int x, int y, int button, int clickCount)
int old_pos = _currentPos; int old_pos = _currentPos;
// Do nothing if there are less items than fit on one page // Do nothing if there are less items than fit on one page
if (_numEntries < _entriesPerPage) if (_numEntries <= _entriesPerPage)
return; return;
if (y <= UP_DOWN_BOX_HEIGHT) { if (y <= UP_DOWN_BOX_HEIGHT) {
@ -107,7 +107,7 @@ void ScrollBarWidget::handleMouseUp(int x, int y, int button, int clickCount)
void ScrollBarWidget::handleMouseMoved(int x, int y, int button) void ScrollBarWidget::handleMouseMoved(int x, int y, int button)
{ {
// Do nothing if there are less items than fit on one page // Do nothing if there are less items than fit on one page
if (_numEntries < _entriesPerPage) if (_numEntries <= _entriesPerPage)
return; return;
if (_draggingPart == kSliderPart) { if (_draggingPart == kSliderPart) {
@ -165,7 +165,7 @@ void ScrollBarWidget::handleTickle()
void ScrollBarWidget::checkBounds(int old_pos) void ScrollBarWidget::checkBounds(int old_pos)
{ {
if (_numEntries < _entriesPerPage || _currentPos < 0) if (_numEntries <= _entriesPerPage || _currentPos < 0)
_currentPos = 0; _currentPos = 0;
else if (_currentPos > _numEntries - _entriesPerPage) else if (_currentPos > _numEntries - _entriesPerPage)
_currentPos = _numEntries - _entriesPerPage; _currentPos = _numEntries - _entriesPerPage;
@ -179,14 +179,19 @@ void ScrollBarWidget::checkBounds(int old_pos)
void ScrollBarWidget::recalc() void ScrollBarWidget::recalc()
{ {
_sliderHeight = (_h - 2 * UP_DOWN_BOX_HEIGHT) * _entriesPerPage / _numEntries; if (_numEntries > _entriesPerPage) {
if (_sliderHeight < UP_DOWN_BOX_HEIGHT) _sliderHeight = (_h - 2 * UP_DOWN_BOX_HEIGHT) * _entriesPerPage / _numEntries;
_sliderHeight = UP_DOWN_BOX_HEIGHT; if (_sliderHeight < UP_DOWN_BOX_HEIGHT)
_sliderHeight = UP_DOWN_BOX_HEIGHT;
_sliderPos = _sliderPos =
UP_DOWN_BOX_HEIGHT + (_h - 2 * UP_DOWN_BOX_HEIGHT - _sliderHeight) * _currentPos / (_numEntries - _entriesPerPage); UP_DOWN_BOX_HEIGHT + (_h - 2 * UP_DOWN_BOX_HEIGHT - _sliderHeight) * _currentPos / (_numEntries - _entriesPerPage);
if (_sliderPos < 0) if (_sliderPos < 0)
_sliderPos = 0; _sliderPos = 0;
} else {
_sliderHeight = _h - 2 * UP_DOWN_BOX_HEIGHT;
_sliderPos = UP_DOWN_BOX_HEIGHT;
}
} }
@ -194,7 +199,7 @@ void ScrollBarWidget::drawWidget(bool hilite)
{ {
NewGui *gui = _boss->getGui(); NewGui *gui = _boss->getGui();
int bottomY = _y + _h; int bottomY = _y + _h;
bool isSinglePage = (_numEntries < _entriesPerPage); bool isSinglePage = (_numEntries <= _entriesPerPage);
gui->frameRect(_x, _y, _w, _h, gui->_shadowcolor); gui->frameRect(_x, _y, _w, _h, gui->_shadowcolor);