R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix server browser not claiming focus on window apparition

Browse Source 
The console draws focus as it does SetKeyboardFocusHere(-1) (on the previous widget, which is the input text field). We don't do this in the server browser, so we must explicitly claim focus by calling SetNextWindowFocus() once before the next frame gets renderer.
This commit is contained in:
Kawe Mazidjatari 2022-10-20 14:23:14 +02:00
parent 4bc0aaf1e6
commit c7d828610d
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
r5dev/gameui/IBrowser.cpp
View File

@ -43,7 +43,7 @@ CBrowser::CBrowser(void)
{
memset(m_szServerAddressBuffer, '\0', sizeof(m_szServerAddressBuffer));
m_pszBrowserTitle = "Server Browser";
m_pszBrowserLabel = "Server Browser";
m_rLockedIconBlob = GetModuleResource(IDB_PNG2);
}
@ -94,23 +94,29 @@ void CBrowser::RunFrame(void)
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 6.f, 6.f }); nVars++;
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, m_flFadeAlpha); nVars++;
}
ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(928.f, 524.f)); nVars++;
ImGui::PushStyleVar(ImGuiStyleVar_WindowMinSize, ImVec2(928.f, 524.f)); nVars++;
if (m_Style != ImGuiStyle_t::MODERN)
{
ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 1.0f); nVars++;
}
if (!ImGui::Begin(m_pszBrowserTitle, &m_bActivate, ImGuiWindowFlags_NoScrollbar, &ResetInput))
if (m_bActivate && m_bReclaimFocus) // Reclaim focus on window apparition.
{
ImGui::SetNextWindowFocus();
m_bReclaimFocus = false;
}
if (!ImGui::Begin(m_pszBrowserLabel, &m_bActivate, ImGuiWindowFlags_NoScrollbar, &ResetInput))
{
ImGui::End();
ImGui::PopStyleVar(nVars);
return;
}
ImGui::PopStyleVar(nVars);
DrawSurface();
ImGui::PopStyleVar(nVars);
ImGui::End();
}
@ -148,6 +154,7 @@ void CBrowser::RunTask()
else // Refresh server list the next time 'm_bActivate' evaluates to true.
{
m_bQueryListNonRecursive = true;
m_bReclaimFocus = true;
}
}
@ -205,6 +212,7 @@ void CBrowser::BrowserPanel(void)
ImGui::BeginGroup();
m_imServerBrowserFilter.Draw();
ImGui::SameLine();
if (ImGui::Button("Refresh List"))
{
m_svServerListMessage.clear();
@ -212,6 +220,7 @@ void CBrowser::BrowserPanel(void)
std::thread refresh(&CBrowser::RefreshServerList, this);
refresh.detach();
}
ImGui::EndGroup();
ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), m_svServerListMessage.c_str());
ImGui::Separator();

3
r5dev/gameui/IBrowser.h
View File

@ -37,11 +37,12 @@ public:
virtual void SetStyleVar(void);
const char* m_pszBrowserTitle = nullptr;
const char* m_pszBrowserLabel = nullptr;
bool m_bActivate = false;
private:
bool m_bInitialized = false;
bool m_bReclaimFocus = false;
bool m_bQueryListNonRecursive = false; // When set, refreshes the server list once the next frame.
char m_szServerAddressBuffer[256] = { '\0' };
char m_szServerEncKeyBuffer[30] = { '\0' };

4
r5dev/gameui/IConsole.cpp
View File

@ -106,10 +106,6 @@ void CConsole::RunFrame(void)
* BASE PANEL SETUP *
**************************/
{
if (!m_bActivate)
{
return;
}
if (!m_bInitialized)
{
Init();