edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8703 from sjrc6/pr_slider

Browse source 
Adjust slider handle size
This commit is contained in:
Dennis Felsing 2024-08-27 09:20:18 +00:00 committed by GitHub
parent 4b8dcc3315 5fb059ad92
commit 9d920b3575
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/game/client/ui.cpp
View file

@ -1332,9 +1332,18 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
Rail.VSplitLeft(pColorInner ? 8.0f : clamp(33.0f, Rail.h, Rail.w / 3.0f), &Handle, 0); Rail.VSplitLeft(pColorInner ? 8.0f : clamp(33.0f, Rail.h, Rail.w / 3.0f), &Handle, 0);
Handle.x += (Rail.w - Handle.w) * Current; Handle.x += (Rail.w - Handle.w) * Current;
CUIRect HandleArea = Handle;
if(!pColorInner)
{
HandleArea.h = pRect->h * 0.9f;
HandleArea.y = pRect->y + pRect->h * 0.05f;
HandleArea.w += 6.0f;
HandleArea.x -= 3.0f;
}
// logic // logic
const bool InsideRail = MouseHovered(&Rail); const bool InsideRail = MouseHovered(&Rail);
const bool InsideHandle = MouseHovered(&Handle); const bool InsideHandle = MouseHovered(&HandleArea);
bool Grabbed = false; // whether to apply the offset bool Grabbed = false; // whether to apply the offset
if(CheckActiveItem(pId)) if(CheckActiveItem(pId))
@ -1366,6 +1375,12 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
Grabbed = true; Grabbed = true;
} }
if(!pColorInner && (InsideHandle || Grabbed) && (CheckActiveItem(pId) || HotItem() == pId))
{
Handle.h += 3.0f;
Handle.y -= 1.5f;
}
if(InsideHandle && !MouseButton(0)) if(InsideHandle && !MouseButton(0))
{ {
SetHotItem(pId); SetHotItem(pId);
@ -1394,7 +1409,7 @@ float CUi::DoScrollbarH(const void *pId, const CUIRect *pRect, float Current, co
else else
{ {
Rail.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rail.h / 2.0f); Rail.Draw(ColorRGBA(1.0f, 1.0f, 1.0f, 0.25f), IGraphics::CORNER_ALL, Rail.h / 2.0f);
Handle.Draw(HandleColor, IGraphics::CORNER_ALL, Handle.h / 2.0f); Handle.Draw(HandleColor, IGraphics::CORNER_ALL, Rail.h / 2.0f);
} }
return ReturnValue; return ReturnValue;