libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 18:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: Update ScrollContainerWidget

Browse Source
This commit is contained in:
Alexander Tkachev 2016-06-22 18:44:47 +06:00 committed by Eugene Sandulenko
parent 9c1eab6415
commit ac25acbccc
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gui/widgets/scrollcontainer.cpp
View File

@ -50,11 +50,32 @@ void ScrollContainerWidget::init() {
}
void ScrollContainerWidget::recalc() {
_verticalScroll->_numEntries = _h + 40;
int scrollbarWidth = g_gui.xmlEval()->getVar("Globals.Scrollbar.Width", 0);
//calculate _limitH - available height (boss's height - boss's "offset")
int d = _boss->getChildY() - _boss->getAbsY();
_limitH = _boss->getHeight() - d;
//calculate virtual height
const int spacing = g_gui.xmlEval()->getVar("Global.Font.Height", 16); //on the bottom
int h = 0;
int min = spacing, max = 0;
Widget *ptr = _firstWidget;
while (ptr) {
if (ptr != _verticalScroll) {
int y = ptr->getAbsY() - getChildY();
min = MIN(min, y - spacing);
max = MAX(max, y + ptr->getHeight() + spacing);
}
ptr = ptr->next();
}
h = max - min;
_verticalScroll->_numEntries = h;
_verticalScroll->_currentPos = _scrolledY;
_verticalScroll->_entriesPerPage = _limitH;
_verticalScroll->setPos(_w - 16, _scrolledY+1);
_verticalScroll->setSize(16, _limitH -2);
_verticalScroll->setPos(_w - scrollbarWidth, _scrolledY+1);
_verticalScroll->setSize(scrollbarWidth, _limitH -2);
}
@ -69,7 +90,7 @@ int16 ScrollContainerWidget::getChildY() const {
}
uint16 ScrollContainerWidget::getWidth() const {
return (_boss ? _boss->getWidth() : _w);
return _w - _verticalScroll->getWidth();
}
uint16 ScrollContainerWidget::getHeight() const {
@ -89,8 +110,8 @@ void ScrollContainerWidget::handleCommand(CommandSender *sender, uint32 cmd, uin
}
void ScrollContainerWidget::reflowLayout() {
recalc();
Widget::reflowLayout();
recalc();
Widget *ptr = _firstWidget;
while (ptr) {
int y = ptr->getAbsY() - getChildY();
@ -108,6 +129,8 @@ void ScrollContainerWidget::drawWidget() {
}
Widget *ScrollContainerWidget::findWidget(int x, int y) {
if (x >= _w - _verticalScroll->getWidth())
return _verticalScroll;
return Widget::findWidgetInChain(_firstWidget, x + _scrolledX, y + _scrolledY);
}