games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Use Scrollable class for all appropriate locations

Browse Source
This commit is contained in:
Ivan Savenko
2023-05-30 18:53:51 +03:00
parent 052d0d314a
commit 0e36a3ab5a
7 changed files with 47 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
client/adventureMap/CList.cpp
View File

@@ -82,9 +82,8 @@ void CList::CListItem::onSelect(bool on)
}
CList::CList(int Size, Rect widgetDimensions)
: CIntObject(WHEEL | GESTURE_PANNING, widgetDimensions.topLeft()),
: Scrollable(0, widgetDimensions.topLeft(), Orientation::VERTICAL),
size(Size),
panningDistanceAccumulated(0),
selected(nullptr)
{
pos.w = widgetDimensions.w;
@@ -108,8 +107,7 @@ void CList::setScrollUpButton(std::shared_ptr<CButton> button)
addChild(button.get());
scrollUp = button;
scrollUp->addCallback(std::bind(&CListBox::moveToPrev, listBox));
scrollUp->addCallback(std::bind(&CList::update, this));
scrollUp->addCallback(std::bind(&CList::scrollPrev, this));
update();
}
@@ -118,8 +116,29 @@ void CList::setScrollDownButton(std::shared_ptr<CButton> button)
addChild(button.get());
scrollDown = button;
scrollDown->addCallback(std::bind(&CList::update, this));
scrollDown->addCallback(std::bind(&CListBox::moveToNext, listBox));
scrollDown->addCallback(std::bind(&CList::scrollNext, this));
update();
}
void CList::scrollBy(int distance)
{
if (distance < 0 && listBox->getPos() < -distance)
listBox->moveToPos(0);
else
listBox->moveToPos(static_cast<int>(listBox->getPos()) + distance);
update();
}
void CList::scrollPrev()
{
listBox->moveToPrev();
update();
}
void CList::scrollNext()
{
listBox->moveToNext();
update();
}
@@ -188,41 +207,6 @@ void CList::selectPrev()
selectIndex(index-1);
}
void CList::panning(bool on)
{
panningDistanceAccumulated = 0;
}
void CList::gesturePanning(const Point & distanceDelta)
{
int panningDistanceSingle = 32;
panningDistanceAccumulated += distanceDelta.y;
while (-panningDistanceAccumulated > panningDistanceSingle )
{
listBox->moveToPrev();
panningDistanceAccumulated += panningDistanceSingle;
}
while (panningDistanceAccumulated > panningDistanceSingle )
{
listBox->moveToNext();
panningDistanceAccumulated -= panningDistanceSingle;
}
update();
}
void CList::wheelScrolled(int distance)
{
if (distance < 0)
listBox->moveToNext();
if (distance > 0)
listBox->moveToPrev();
update();
}
CHeroList::CEmptyHeroItem::CEmptyHeroItem()
{
OBJECT_CONSTRUCTION_CAPTURING(255-DISPOSE);