tobid7/renderd7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't Scroll in Scrollbar

Browse Source
This commit is contained in:
tobid7 2024-06-26 08:04:43 +02:00
parent b737ab1350
commit 586134787c
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/UI7.cpp
View File

@ -822,26 +822,28 @@ bool BeginMenu(const std::string &title, R7Vec2 size, UI7MenuFlags flags) {
ui7_ctx->cm->scrolling_mod = 0.f; ui7_ctx->cm->scrolling_mod = 0.f;
} }
if (ui7_ctx->cm->has_touch) { if (ui7_ctx->cm->has_touch) {
auto np = RenderD7::Hid::GetTouchPosition();
if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Down)) { if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Down)) {
// Set the mdp Value as Start Pos // Set the mdp Value as Start Pos
ui7_ctx->cm->mdp = RenderD7::Hid::GetTouchPosition(); ui7_ctx->cm->mdp = np;
} else if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Up)) { } else if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Up)) {
// 0 out the start pos // 0 out the start pos
ui7_ctx->cm->mdp = R7Vec2(); ui7_ctx->cm->mdp = R7Vec2();
} }
if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Held)) { if (RenderD7::Hid::IsEvent("touch", RenderD7::Hid::Held)) {
// Set modifier // Set modifier
auto np = RenderD7::Hid::GetTouchPosition(); if(!InBox(np, R7Vec2(RenderD7::R2()->GetCurrentScreenSize().x - 8 - 5, 5 + ui7_ctx->cm->tbh), R7Vec2(8, 240 - ui7_ctx->cm->tbh - 10))) {
// Check if and do nothing if the scrolling ofset goes out of screen // Check if and do nothing if the scrolling ofset goes out of screen
if (ui7_ctx->cm->scrolling_offset < ui7_ctx->cm->ms.y - 200 && if (ui7_ctx->cm->scrolling_offset < ui7_ctx->cm->ms.y - 200 &&
ui7_ctx->cm->scrolling_offset > -40) { ui7_ctx->cm->scrolling_offset > -40) {
float cursor_mod = (ui7_ctx->cm->mdp.y - np.y); float cursor_mod = (ui7_ctx->cm->mdp.y - np.y);
if (ui7_ctx->cm->scrolling_mod <= 4.f && if (ui7_ctx->cm->scrolling_mod <= 4.f &&
ui7_ctx->cm->scrolling_mod >= -4 && cursor_mod != 0.0f) { ui7_ctx->cm->scrolling_mod >= -4 && cursor_mod != 0.0f) {
if (cursor_mod > 2) { if (cursor_mod > 2) {
ui7_ctx->cm->scrolling_mod = cursor_mod; ui7_ctx->cm->scrolling_mod = cursor_mod;
} else if (cursor_mod < -2) { } else if (cursor_mod < -2) {
ui7_ctx->cm->scrolling_mod = cursor_mod; ui7_ctx->cm->scrolling_mod = cursor_mod;
}
} }
} }
} }