7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-25 04:11:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix scrollbar hitbox being goofy due to ignoring anchor point position

Browse source
This commit is contained in:
HJfod 2023-03-30 18:45:27 +03:00
parent e2e1da069d
commit 585a9de18d
1 changed files with 5 additions and 5 deletions

10
loader/src/ui/nodes/Scrollbar.cpp
View file

@ -6,8 +6,6 @@ using namespace geode::prelude;
bool Scrollbar::ccTouchBegan(CCTouch* touch, CCEvent* event) {
// hitbox
auto rect = this->boundingBox();
// since anchor point is 0.5, 0.5 it's offset
rect.origin -= this->getScaledContentSize() / 2;
if (!m_target || !rect.containsPoint(touch->getLocation())) return false;
// trigger scrollbar thumb move
@ -40,7 +38,7 @@ void Scrollbar::ccTouchMoved(CCTouch* touch, CCEvent*) {
auto thumbHeight = m_resizeThumb ? std::min(p, 1.f) * targetHeight / .4f : 0;
auto posY = h *
((-pos.y - targetHeight / 2 + thumbHeight / 4 - 5) / (targetHeight - thumbHeight / 2 + 10));
((-pos.y + thumbHeight / 4 - 5) / (targetHeight - thumbHeight / 2 + 10));
if (posY > 0.0f) posY = 0.0f;
if (posY < -h) posY = -h;
@ -73,7 +71,7 @@ void Scrollbar::draw() {
m_track->setContentSize({ m_width / m_track->getScale(),
targetHeight / m_track->getScale() });
}
m_track->setPosition(.0f, .0f);
m_track->setPosition(m_obContentSize / 2);
this->setContentSize({ m_width, targetHeight });
@ -121,7 +119,7 @@ void Scrollbar::draw() {
thumbPosY -= fHeightBottom();
}
m_thumb->setPosition(0.f, thumbPosY);
m_thumb->setPosition(m_obContentSize / 2 + ccp(0.f, thumbPosY));
if (m_resizeThumb) {
m_thumb->setContentSize({ m_width, thumbHeight });
}
@ -134,6 +132,8 @@ void Scrollbar::setTarget(CCScrollLayerExt* target) {
bool Scrollbar::init(CCScrollLayerExt* target) {
if (!this->CCLayer::init()) return false;
this->ignoreAnchorPointForPosition(false);
m_target = target;
if (cocos::fileExistsInSearchPaths("scrollbar.png"_spr)) {