From b468eb754947dc1785ad92549cb048d49c8d873c Mon Sep 17 00:00:00 2001 From: Yimura Date: Sat, 16 Jan 2021 16:21:00 +0100 Subject: [PATCH] fix(UserSidebar): Fixed height and top offset --- BigBaseV2/src/gui/windows/user_sidebar.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/BigBaseV2/src/gui/windows/user_sidebar.cpp b/BigBaseV2/src/gui/windows/user_sidebar.cpp index 3fe2d4e5..e8e45043 100644 --- a/BigBaseV2/src/gui/windows/user_sidebar.cpp +++ b/BigBaseV2/src/gui/windows/user_sidebar.cpp @@ -5,11 +5,12 @@ namespace big { void window::render_user_sidebar() { - ImGui::SetNextWindowSize({ 350.f, (float)y }, ImGuiCond_Always); - ImGui::SetNextWindowPos({ x - 350.f, 28.f }, ImGuiCond_Always); + static const float height_correction = 28.f; + ImGui::SetNextWindowSize({ 350.f, (float)y - height_correction }, ImGuiCond_Always); + ImGui::SetNextWindowPos({ x - 350.f, height_correction }, ImGuiCond_Always); if (ImGui::Begin("###player_menu", NULL, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoNav)) { - auto vecButtonWidth = ImVec2(ImGui::GetWindowSize().x, 0.0f); + auto vecButtonWidth = ImVec2(ImGui::GetWindowSize().x - 30.f, 0.0f); ImGui::TextColored({ 255,255,255,255 }, "YOU:"); @@ -29,6 +30,8 @@ namespace big if (ImGui::TreeNode("Friends")) { + ImGui::Unindent(); + bool friendInLobby = false; for (int i = 0; i < 32; i++) @@ -52,12 +55,15 @@ namespace big ImGui::TextColored({ 180,180,180,255 }, " No friends in current lobby."); } + ImGui::Indent(); ImGui::TreePop(); ImGui::Separator(); } if (ImGui::TreeNode("Players")) { + ImGui::Unindent(); + for (int i = 0; i < 32; i++) { player player = g_players[i]; @@ -72,6 +78,7 @@ namespace big } } + ImGui::Indent(); ImGui::TreePop(); }