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

Client: fix push/pop style var mismatch

Browse Source 
Since the table was taken out of the child instance in commit 245ff565042870e0cded7a2ec3dcc868a00414af, we should no longer handle the window and frame separately. Car count must now be counted together.
This commit is contained in:
Kawe Mazidjatari 2024-08-21 02:26:48 +02:00
parent 3a17d60182
commit 291ce4488a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gameui/IBrowser.cpp
View File

@ -233,14 +233,13 @@ void CBrowser::DrawBrowserPanel(void)
ImGui::TextColored(ImVec4(1.00f, 0.00f, 0.00f, 1.00f), "%s", m_serverListMessage.c_str());
ImGui::Separator();
int windowStyleVars = 0; // Eliminate borders around server list table.
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 1.f, 0.f }); windowStyleVars++;
int frameStyleVars = 0; // Eliminate borders around server list table.
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2{ 1.f, 0.f }); frameStyleVars++;
const float fFooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
if (ImGui::BeginTable("##ServerBrowser_ServerListTable", 6, ImGuiTableFlags_Resizable | ImGuiTableFlags_ScrollY, { 0, -fFooterHeight }))
{
int frameStyleVars = 0;
if (m_surfaceStyle == ImGuiStyle_t::MODERN)
{
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2{ 8.f, 0.f }); frameStyleVars++;
@ -327,12 +326,14 @@ void CBrowser::DrawBrowserPanel(void)
filteredServers.clear();
g_ServerListManager.m_Mutex.Unlock();
ImGui::PopStyleVar(frameStyleVars);
ImGui::EndTable();
}
else
{
ImGui::PopStyleVar(frameStyleVars);
}
ImGui::PopStyleVar(windowStyleVars);
ImGui::Separator();
const ImVec2 regionAvail = ImGui::GetContentRegionAvail();