Skip to content

NeoUI - External popup menus #1344

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
Sep 21, 2025
Merged

NeoUI - External popup menus #1344

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
128 changes: 65 additions & 63 deletions 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 @@ -31,6 +31,11 @@ static constexpr int WDGINFO_ALLOC_STEPS = 64;
static_assert(DEBUG_NEOUI == 0);
#endif

static bool RightClickMenuActive()
{
return (c->iRightClick >= 0 && c->iRightClickSection >= 0 && c->pwszRightClickList && c->ipwszRightClickListSize > 0);
}

void SwapFont(const EFont eFont, const bool bForce)
{
if (c->eMode != MODE_PAINT || (!bForce && (c->eFont == eFont))) return;
Expand Down Expand Up @@ -318,7 +323,7 @@ void BeginContext(NeoUI::Context *pNextCtx, const NeoUI::Mode eMode, const wchar

void EndContext()
{
if (c->iRightClick >= 0 && c->iRightClickSection >= 0 && c->pwszRightClickList && c->ipwszRightClickListSize > 0)
if (RightClickMenuActive())
{
bool bDeInitRightClick = false;
switch (c->eMode)
Expand Down Expand Up @@ -404,12 +409,19 @@ void EndContext()

if (bDeInitRightClick)
{
if (c->fnRightClickRet && IN_BETWEEN_AR(0, c->iRightClickHotItem, c->ipwszRightClickListSize))
{
c->fnRightClickRet(c->pData, c->iRightClickHotItem);
}

// Already set wide/tall indicates right-click menu already initalized before
// and can now de-initialize/close
c->iRightClick = -1;
c->iRightClickSection = -1;
c->pwszRightClickList = nullptr;
c->ipwszRightClickListSize = 0;
c->fnRightClickRet = nullptr;
c->pData = nullptr;
}
}

Expand Down Expand Up @@ -802,7 +814,14 @@ GetMouseinFocusedRet BeginWidget(const WidgetFlag eWidgetFlag)
c->iHot = c->iWidget;
c->iHotSection = c->iSection;
}
const bool bHot = c->iHot == c->iWidget && c->iHotSection == c->iSection;
bool bHot = c->iHot == c->iWidget && c->iHotSection == c->iSection;
if (bHot && RightClickMenuActive())
{
const Dim &dim = c->dimRightClick;
bHot = !(IN_BETWEEN_EQ(dim.x, c->iMouseAbsX, dim.x + dim.wide) &&
IN_BETWEEN_EQ(dim.y, c->iMouseAbsY, dim.y + dim.tall));
}

const bool bActive = c->iWidget == c->iActive && c->iSection == c->iActiveSection;
if (bActive || bHot)
{
Expand Down Expand Up @@ -983,7 +1002,7 @@ void Label(const wchar_t *wszLabel, const wchar_t *wszText)
Label(wszText);
}

NeoUI::RetButton Button(const wchar_t *wszText)
NeoUI::RetButton BaseButton(const wchar_t *wszText, const char *szTexturePath, const EBaseButtonType eType)
{
const auto wdgState = BeginWidget(WIDGETFLAG_MOUSE | WIDGETFLAG_MARKACTIVE);

Expand All @@ -996,18 +1015,32 @@ NeoUI::RetButton Button(const wchar_t *wszText)
{
case MODE_PAINT:
{
vgui::surface()->DrawFilledRectArray(&c->rWidgetArea, 1);
switch (eType)
{
case BASEBUTTONTYPE_TEXT:
{
vgui::surface()->DrawFilledRectArray(&c->rWidgetArea, 1);

const auto *pFontI = &c->fonts[c->eFont];
const int x = XPosFromText(wszText, pFontI, c->eButtonTextStyle);
const int y = pFontI->iYOffset;
vgui::surface()->DrawSetTextPos(c->rWidgetArea.x0 + x, c->rWidgetArea.y0 + y);
vgui::surface()->DrawPrintText(wszText, V_wcslen(wszText));
const auto *pFontI = &c->fonts[c->eFont];
const int x = XPosFromText(wszText, pFontI, c->eButtonTextStyle);
const int y = pFontI->iYOffset;
vgui::surface()->DrawSetTextPos(c->rWidgetArea.x0 + x, c->rWidgetArea.y0 + y);
vgui::surface()->DrawPrintText(wszText, V_wcslen(wszText));
} break;
case BASEBUTTONTYPE_IMAGE:
{
vgui::surface()->DrawFilledRect(c->rWidgetArea.x0, c->rWidgetArea.y0,
c->rWidgetArea.x1, c->rWidgetArea.y1);
Texture(szTexturePath, c->rWidgetArea.x0, c->rWidgetArea.y0,
c->irWidgetWide, c->irWidgetTall);
} break;
}
}
break;
case MODE_MOUSEPRESSED:
{
ret.bMousePressed = ret.bPressed = (ret.bMouseHover && c->eCode == MOUSE_LEFT);
ret.bMouseRightPressed = (ret.bMouseHover && c->eCode == MOUSE_RIGHT);
}
break;
case MODE_MOUSEDOUBLEPRESSED:
Expand Down Expand Up @@ -1035,6 +1068,11 @@ NeoUI::RetButton Button(const wchar_t *wszText)
return ret;
}

NeoUI::RetButton Button(const wchar_t *wszText)
{
return BaseButton(wszText, "", BASEBUTTONTYPE_TEXT);
}

NeoUI::RetButton Button(const wchar_t *wszLeftLabel, const wchar_t *wszText)
{
MultiWidgetHighlighter(2);
Expand Down Expand Up @@ -1198,52 +1236,7 @@ bool Texture(const char *szTexturePath, const int x, const int y, const int widt

NeoUI::RetButton ButtonTexture(const char *szTexturePath)
{
const auto wdgState = BeginWidget(WIDGETFLAG_MOUSE | WIDGETFLAG_MARKACTIVE);

RetButton ret = {};
ret.bMouseHover = wdgState.bHot;

if (IN_BETWEEN_AR(0, c->irWidgetLayoutY, c->dPanel.tall))
{
switch (c->eMode)
{
case MODE_PAINT:
{
vgui::surface()->DrawFilledRect(c->rWidgetArea.x0, c->rWidgetArea.y0,
c->rWidgetArea.x1, c->rWidgetArea.y1);
Texture(szTexturePath, c->rWidgetArea.x0, c->rWidgetArea.y0,
c->irWidgetWide, c->irWidgetTall);
}
break;
case MODE_MOUSEPRESSED:
{
ret.bMousePressed = ret.bPressed = (ret.bMouseHover && c->eCode == MOUSE_LEFT);
}
break;
case MODE_MOUSEDOUBLEPRESSED:
{
ret.bMouseDoublePressed = ret.bPressed = (ret.bMouseHover && c->eCode == MOUSE_LEFT);
}
break;
case MODE_KEYPRESSED:
{
ret.bKeyPressed = ret.bPressed = (wdgState.bActive && IsKeyEnter());
}
break;
default:
break;
}

if (ret.bPressed)
{
c->iActive = c->iWidget;
c->iActiveSection = c->iSection;
}

}

EndWidget(wdgState);
return ret;
return BaseButton(L"", szTexturePath, BASEBUTTONTYPE_IMAGE);
}

void ResetTextures()
Expand Down Expand Up @@ -1953,14 +1946,8 @@ void TextEdit(wchar_t *wszText, const int iMaxWszTextSize, const ETextEditFlags
static const wchar *PWSZ_TEXTEDIT_RIGHTCLICK[COPYMENU__TOTAL] = {
L"Cut", L"Copy", L"Paste",
};
c->dimRightClick.x = c->iMouseAbsX;
c->dimRightClick.y = c->iMouseAbsY;
c->dimRightClick.wide = 0;
c->dimRightClick.tall = 0;
c->iRightClick = c->iWidget;
c->iRightClickSection = c->iSection;
c->pwszRightClickList = PWSZ_TEXTEDIT_RIGHTCLICK;
c->ipwszRightClickListSize = ARRAYSIZE(PWSZ_TEXTEDIT_RIGHTCLICK);
PopupMenu(PWSZ_TEXTEDIT_RIGHTCLICK, ARRAYSIZE(PWSZ_TEXTEDIT_RIGHTCLICK),
nullptr, nullptr);
} break;
default:
break;
Expand Down Expand Up @@ -2285,4 +2272,19 @@ const wchar_t *HintAlt(const wchar *wszKey, const wchar *wszController)
return (c->eKeyHints == NeoUI::KEYHINTS_KEYBOARD) ? wszKey : wszController;
}

void PopupMenu(const wchar **pwszRightClickList, const int ipwszRightClickListSize,
void (*fnRightClickRet)(void *, int), void *pData)
{
c->dimRightClick.x = c->iMouseAbsX;
c->dimRightClick.y = c->iMouseAbsY;
c->dimRightClick.wide = 0;
c->dimRightClick.tall = 0;
c->iRightClick = c->iWidget;
c->iRightClickSection = c->iSection;
c->pwszRightClickList = pwszRightClickList;
c->ipwszRightClickListSize = ipwszRightClickListSize;
c->fnRightClickRet = fnRightClickRet;
c->pData = pData;
}

} // namespace NeoUI
14 changes: 14 additions & 0 deletions 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 @@ -140,6 +140,12 @@ enum ETextEditFlags
TEXTEDITFLAG_PASSWORD = 1 << 0,
};

enum EBaseButtonType
{
BASEBUTTONTYPE_TEXT = 0,
BASEBUTTONTYPE_IMAGE,
};

struct SliderInfo
{
wchar_t wszText[33];
Expand Down Expand Up @@ -271,6 +277,8 @@ struct Context
int ipwszRightClickListSize = 0;
const wchar **pwszRightClickList = nullptr;
Dim dimRightClick = {};
void (*fnRightClickRet)(void *, int) = nullptr;
void *pData = nullptr;

// TextEdit text selection
int iTextSelStart = -1;
Expand All @@ -293,6 +301,7 @@ struct RetButton
bool bMousePressed;
bool bMouseHover;
bool bMouseDoublePressed;
bool bMouseRightPressed;
};

struct LabelExOpt
Expand Down Expand Up @@ -354,6 +363,7 @@ void EndOverrideFgColor();
/*1W*/ void Label(const wchar_t *wszText, const LabelExOpt &opt);
/*2W*/ void Label(const wchar_t *wszLabel, const wchar_t *wszText);
/*1W*/ void Tabs(const wchar_t **wszLabelsList, const int iLabelsSize, int *iIndex);
/*1W*/ RetButton BaseButton(const wchar_t *wszText, const char *szTexturePath, const EBaseButtonType eType);
/*1W*/ RetButton Button(const wchar_t *wszText);
/*2W*/ RetButton Button(const wchar_t *wszLeftLabel, const wchar_t *wszText);
/*1W*/ RetButton ButtonTexture(const char *szTexturePath);
Expand Down Expand Up @@ -383,6 +393,10 @@ bool Texture(const char *szTexturePath, const int x, const int y, const int widt
const char *szTextureGroup = "", const TextureOptFlags texFlags = TEXTUREOPTFLAGS_NONE);
void ResetTextures();

// Right-click menu
void PopupMenu(const wchar **pwszRightClickList, const int ipwszRightClickListSize,
void (*fnRightClickRet)(void *, int), void *pData);

// Non-widgets/convenience functions
bool Bind(const ButtonCode_t eCode);
bool Bind(const ButtonCode_t *peCode, const int ieCodeSize);
Expand Down
Loading