diff --git a/loader/include/Geode/utils/Result.hpp b/loader/include/Geode/utils/Result.hpp index dff90491..b7ce5f71 100644 --- a/loader/include/Geode/utils/Result.hpp +++ b/loader/include/Geode/utils/Result.hpp @@ -256,6 +256,12 @@ namespace geode { } return std::nullopt; } + + /** + * Completely disregard the result. Only recommended if the result is + * inconsequential + */ + constexpr void disregard() && {} }; template diff --git a/loader/src/ui/nodes/ScrollLayer.cpp b/loader/src/ui/nodes/ScrollLayer.cpp index f4aeca2b..5af4e493 100644 --- a/loader/src/ui/nodes/ScrollLayer.cpp +++ b/loader/src/ui/nodes/ScrollLayer.cpp @@ -29,11 +29,11 @@ void ScrollLayer::visit() { glEnable(GL_SCISSOR_TEST); if (this->getParent()) { - CCPoint const offset = this->isIgnoreAnchorPointForPosition() - ? ccp(0, 0) : CCPoint(this->getContentSize() * -this->getAnchorPoint()); + // CCPoint const offset = this->isIgnoreAnchorPointForPosition() + // ? ccp(0, 0) : CCPoint(this->getContentSize() * -this->getAnchorPoint()); - auto const bottomLeft = this->convertToWorldSpace(ccp(0, 0) - offset); - auto const topRight = this->convertToWorldSpace(this->getContentSize() - offset); + auto const bottomLeft = this->convertToWorldSpace(ccp(0, 0)); + auto const topRight = this->convertToWorldSpace(this->getContentSize()); CCSize const size = topRight - bottomLeft; CCEGLView::get()->setScissorInPoints(bottomLeft.x, bottomLeft.y, size.width, size.height);