Skip to content

NeoUI - Add scrollbar to scrollable sections #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nullsystem merged 1 commit into from
Oct 12, 2024
Merged

NeoUI - Add scrollbar to scrollable sections #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 70 additions & 3 deletions mp/src/game/client/neo/ui/neo_ui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ static const wchar_t *ENABLED_LABELS[] = {
#define IN_BETWEEN_AR(min, cmp, max) (((min) <= (cmp)) && ((cmp) < (max)))
#define IN_BETWEEN_EQ(min, cmp, max) (((min) <= (cmp)) && ((cmp) <= (max)))

[[nodiscard]] static bool InRect(const vgui::IntRect &rect, const int x, const int y)
{
return IN_BETWEEN_EQ(rect.x0, x, rect.x1) && IN_BETWEEN_EQ(rect.y0, y, rect.y1);
}

[[nodiscard]] static int LoopAroundMinMax(const int iValue, const int iMin, const int iMax)
{
if (iValue < iMin)
Expand Down Expand Up @@ -279,9 +284,20 @@ void EndSection()

// Scroll handling
const int iRowsInScreen = g_pCtx->dPanel.tall / g_pCtx->iRowTall;
if (g_pCtx->eMode == MODE_MOUSEWHEELED && g_pCtx->bMouseInPanel)
const bool bHasScroll = (g_pCtx->iPartitionY > iRowsInScreen);
vgui::IntRect rectScrollArea = (bHasScroll) ?
Comment thread
nullsystem marked this conversation as resolved.
vgui::IntRect{
.x0 = g_pCtx->dPanel.x + g_pCtx->dPanel.wide,
.y0 = g_pCtx->dPanel.y,
.x1 = g_pCtx->dPanel.x + g_pCtx->dPanel.wide + g_pCtx->iRowTall,
.y1 = g_pCtx->dPanel.y + g_pCtx->dPanel.tall,
} : vgui::IntRect{};
const bool bMouseInScrollbar = bHasScroll && InRect(rectScrollArea, g_pCtx->iMouseAbsX, g_pCtx->iMouseAbsY);
const bool bMouseInWheelable = g_pCtx->bMouseInPanel || bMouseInScrollbar;

if (g_pCtx->eMode == MODE_MOUSEWHEELED && bMouseInWheelable)
{
if (g_pCtx->iPartitionY <= iRowsInScreen)
if (!bHasScroll)
{
g_pCtx->iYOffset[g_pCtx->iSection] = 0;
}
Expand All @@ -294,7 +310,7 @@ void EndSection()
else if (g_pCtx->eMode == MODE_KEYPRESSED && (g_pCtx->eCode == KEY_DOWN || g_pCtx->eCode == KEY_UP) &&
(g_pCtx->iActiveSection == g_pCtx->iSection || g_pCtx->iHotSection == g_pCtx->iSection))
{
if (g_pCtx->iPartitionY <= iRowsInScreen)
if (!bHasScroll)
{
// Disable scroll if it doesn't need to
g_pCtx->iYOffset[g_pCtx->iSection] = 0;
Expand All @@ -311,6 +327,57 @@ void EndSection()
}
}

// Scroll bar area painting and mouse interaction (no keyboard as that's handled by active widgets)
if (bHasScroll)
{
const int iYStart = g_pCtx->iYOffset[g_pCtx->iSection];
const int iYEnd = iYStart + iRowsInScreen;
const float flYPercStart = iYStart / static_cast<float>(g_pCtx->iWidget);
const float flYPercEnd = iYEnd / static_cast<float>(g_pCtx->iWidget);
vgui::IntRect rectHandle{
g_pCtx->dPanel.x + g_pCtx->dPanel.wide,
g_pCtx->dPanel.y + static_cast<int>(g_pCtx->dPanel.tall * flYPercStart),
g_pCtx->dPanel.x + g_pCtx->dPanel.wide + g_pCtx->iRowTall,
g_pCtx->dPanel.y + static_cast<int>(g_pCtx->dPanel.tall * flYPercEnd)
};

bool bAlterOffset = false;
switch (g_pCtx->eMode)
{
case MODE_PAINT:
surface()->DrawSetColor(g_pCtx->bgColor);
surface()->DrawFilledRectArray(&rectScrollArea, 1);
surface()->DrawSetColor(g_pCtx->abYMouseDragOffset[g_pCtx->iSection] ? g_pCtx->selectBgColor : g_pCtx->normalBgColor);
surface()->DrawFilledRectArray(&rectHandle, 1);
break;
case MODE_MOUSEPRESSED:
g_pCtx->abYMouseDragOffset[g_pCtx->iSection] = bMouseInScrollbar;
if (bMouseInScrollbar)
{
// If not pressed on handle, set the drag at the middle
const bool bInHandle = InRect(rectHandle, g_pCtx->iMouseAbsX, g_pCtx->iMouseAbsY);
g_pCtx->iStartMouseDragOffset[g_pCtx->iSection] = (bInHandle) ?
(g_pCtx->iMouseAbsY - rectHandle.y0) :((rectHandle.y1 - rectHandle.y0) / 2.0f);
bAlterOffset = true;
}
break;
case MODE_MOUSERELEASED:
g_pCtx->abYMouseDragOffset[g_pCtx->iSection] = false;
break;
case MODE_MOUSEMOVED:
bAlterOffset = g_pCtx->abYMouseDragOffset[g_pCtx->iSection];
break;
default:
Comment thread
nullsystem marked this conversation as resolved.
break;
}

if (bAlterOffset)
{
const float flXPercMouse = static_cast<float>(g_pCtx->iMouseRelY - g_pCtx->iStartMouseDragOffset[g_pCtx->iSection]) / static_cast<float>(g_pCtx->dPanel.tall);
g_pCtx->iYOffset[g_pCtx->iSection] = clamp(flXPercMouse * g_pCtx->iWidget, 0, (g_pCtx->iWidget - iRowsInScreen));
}
}

g_pCtx->iSectionCanActive[g_pCtx->iSection] = g_pCtx->iCanActives;
++g_pCtx->iSection;
}
Expand Down
2 changes: 2 additions & 0 deletions mp/src/game/client/neo/ui/neo_ui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ struct Context
int iLayoutY;
int iWgXPos;
int iYOffset[MAX_SECTIONS] = {};
bool abYMouseDragOffset[MAX_SECTIONS] = {};
int iStartMouseDragOffset[MAX_SECTIONS] = {};

int iHorizontalWidth;
int iHorizontalMargin;
Expand Down