From 81b90a28ab375bc7c32217a4636b434aac135b37 Mon Sep 17 00:00:00 2001 From: IcePixelx <41352111+PixieCore@users.noreply.github.com> Date: Fri, 6 Aug 2021 22:52:14 +0200 Subject: [PATCH] fixed debug compilation fully now. --- r5dev/src/id3dx.cpp | 2 +- r5dev/src/overlay.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/r5dev/src/id3dx.cpp b/r5dev/src/id3dx.cpp index e906e91e..5e39f3a3 100644 --- a/r5dev/src/id3dx.cpp +++ b/r5dev/src/id3dx.cpp @@ -259,8 +259,8 @@ void DrawImGui() if (!GameGlobals::IsInitialized || !GameGlobals::InputSystem) // Check if GameGlobals initialized and if InputSystem is valid. return; - ImGui_ImplWin32_NewFrame(); ImGui_ImplDX11_NewFrame(); + ImGui_ImplWin32_NewFrame(); ImGui::NewFrame(); diff --git a/r5dev/src/overlay.cpp b/r5dev/src/overlay.cpp index 2ab57b21..1c62a862 100644 --- a/r5dev/src/overlay.cpp +++ b/r5dev/src/overlay.cpp @@ -540,12 +540,12 @@ void CCompanion::ServerBrowserSection() const float FooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); ImGui::BeginChild("ServerListChild", { 0, -FooterHeight }, true, ImGuiWindowFlags_AlwaysVerticalScrollbar); - ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiWindowFlags_None); + ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable); { - ImGui::TableSetupColumn("Name", 0, 35); - ImGui::TableSetupColumn("Map", 0, 25); - ImGui::TableSetupColumn("Port", 0, 10); - ImGui::TableSetupColumn("", 0, 8); + ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthStretch, 35); + ImGui::TableSetupColumn("Map", ImGuiTableColumnFlags_WidthStretch, 25); + ImGui::TableSetupColumn("Port", ImGuiTableColumnFlags_WidthStretch, 10); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch, 8); ImGui::TableHeadersRow(); for (ServerListing* server : ServerList)