Skip to content

NeoUI changes (mostly backported from scoreboard change) #1949

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

Open
nullsystem wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NeoUI changes (mostly backported from scoreboard change) #1949

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
18 changes: 10 additions & 8 deletions src/game/client/neo/ui/neo_root.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,13 @@ void CNeoRoot::OnMainLoop(const NeoUI::Mode eMode)

NeoUI::EndContext();

if (STATE_SETTINGS == m_state
&& !m_ns.bModified
&& g_uiCtx.bValueEdited)
{
m_ns.bModified = true;
}

// When the state changes, save some variables
if (m_state != ePrevState)
{
Expand Down Expand Up @@ -1161,7 +1168,7 @@ void CNeoRoot::MainLoopRoot(const MainLoopParam param)
g_uiCtx.dPanel.wide = flMP3Wide;
g_uiCtx.dPanel.tall = param.tall;

NeoUI::BeginSection();
NeoUI::BeginSection(NeoUI::SECTIONFLAG_DISABLEOFFSETS);

NeoUI::SwapFont(NeoUI::FONT_NTNORMAL);
g_uiCtx.eButtonTextStyle = NeoUI::TEXTSTYLE_LEFT;
Expand Down Expand Up @@ -1413,11 +1420,6 @@ void CNeoRoot::MainLoopSettings(const MainLoopParam param)
NeoUI::EndSection();
}

if (!m_ns.bModified && g_uiCtx.bValueEdited)
{
m_ns.bModified = true;
}

if (m_ns.bBack)
{
m_ns.bBack = false;
Expand Down Expand Up @@ -1671,7 +1673,7 @@ void CNeoRoot::MainLoopServerBrowser(const MainLoopParam param)
NeoUI::OpenPopup(NEOPOPUP_ACTIONBLACKLIST, NeoUI::Dim{
.x = g_uiCtx.iMouseAbsX,
.y = g_uiCtx.iMouseAbsY,
.wide = NeoUI::PopupWideByStr("Remove from blacklist"),
.wide = NeoUI::SuitableWideByWStr(L"Remove from blacklist", NeoUI::SUITABLEWIDE_POPUP),
.tall = g_uiCtx.layout.iDefRowTall,
});
}
Expand Down Expand Up @@ -1867,7 +1869,7 @@ void CNeoRoot::MainLoopServerBrowser(const MainLoopParam param)
NeoUI::OpenPopup(NEOPOPUP_ACTIONSERVER, NeoUI::Dim{
.x = g_uiCtx.iMouseAbsX,
.y = g_uiCtx.iMouseAbsY,
.wide = NeoUI::PopupWideByStr("Add to blacklist"),
.wide = NeoUI::SuitableWideByWStr(L"Add to blacklist", NeoUI::SUITABLEWIDE_POPUP),
.tall = g_uiCtx.layout.iDefRowTall * 2,
});

Expand Down
Loading
Loading