voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 19:11:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat: horizontal scroll

Browse source
This commit is contained in:
MihailRis 2026-08-07 22:26:58 +03:00
parent 2448869bf9
commit 863cc923a0
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/graphics/ui/elements/Container.cpp
View file

@ -11,7 +11,7 @@
using namespace gui;
Container::Container(GUI& gui, glm::vec2 size) : UINode(gui, size) {
actualLength = size.y;
actualLengthY = size.y;
setColor(glm::vec4());
}
@ -26,7 +26,7 @@ std::shared_ptr<UINode> Container::getAt(const glm::vec2& pos) {
if (!isInside(pos)) {
return nullptr;
}
int diff = (actualLength-size.y);
int diff = (actualLengthY-size.y);
if (scrollable && diff > 0 && pos.x > calcPos().x + getSize().x - scrollBarWidth) {
return UINode::getAt(pos);
}
@ -65,11 +65,11 @@ void Container::mouseMove(int x, int y) {
auto pos = calcPos();
x -= pos.x;
y -= pos.y;
int diff = (actualLength-size.y);
int diff = (actualLengthY-size.y);
if (diff > 0) {
scroll -= (y - prevScrollY) / static_cast<float>(size.y) * actualLength;
scroll = -glm::min(
glm::max(static_cast<float>(-scroll), 0.0f), actualLength - size.y
scrollY -= (y - prevScrollY) / static_cast<float>(size.y) * actualLengthY;
scrollY = -glm::min(
glm::max(static_cast<float>(-scrollY), 0.0f), actualLengthY - size.y
);
}
prevScrollY = y;
@ -110,7 +110,10 @@ void Container::act(float delta) {
}
void Container::scrolled(int value) {
int diff = (actualLength-getSize().y);
auto size = getSize();
int diff = (actualLengthY > size.y ? actualLengthY - size.y : actualLengthX - size.x);
int& scroll = (actualLengthY > size.y ? scrollY : scrollX);
if (scroll < 0 && diff <= 0) {
scroll = 0;
}
@ -146,14 +149,14 @@ void Container::draw(const DrawContext& pctx, const Assets& assets) {
node->draw(pctx, assets);
}
int diff = (actualLength-size.y);
int diff = (actualLengthY-size.y);
if (scrollable && diff > 0) {
int h = glm::max(size.y / actualLength * size.y, scrollBarWidth / 2.0f);
int h = glm::max(size.y / actualLengthY * size.y, scrollBarWidth / 2.0f);
batch->untexture();
batch->setColor(glm::vec4(1, 1, 1, 0.3f));
batch->rect(
pos.x + size.x - scrollBarWidth,
pos.y - scroll / static_cast<float>(diff) * (size.y - h),
pos.y - scrollY / static_cast<float>(diff) * (size.y - h),
scrollBarWidth, h
);
}
@ -248,7 +251,7 @@ void Container::refresh() {
}
void Container::setScroll(int scroll) {
this->scroll = scroll;
this->scrollY = scroll;
}
const std::vector<std::shared_ptr<UINode>>& Container::getNodes() const {