cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-02-21 11:21:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed incorrect ImGui::EndTabBar usage

Browse source
This commit is contained in:
myT 2024-07-02 22:23:39 +02:00
parent eee321a641
commit 4955060c9f
3 changed files with 185 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/renderer/crp_volumetric_light.cpp
View file

@ -1622,8 +1622,8 @@ void VolumetricLight::DrawGUI()
const char* axisNames[3] = { "X", "Y", "Z" }; const char* axisNames[3] = { "X", "Y", "Z" };
ImGui::BeginTabBar("Tabs#Fogs", ImGuiTabBarFlags_AutoSelectNewTabs); if(ImGui::BeginTabBar("Tabs#Fogs", ImGuiTabBarFlags_AutoSelectNewTabs))
{
for(int i = 0; i < fogCount; i++) for(int i = 0; i < fogCount; i++)
{ {
if(ImGui::BeginTabItem(va("#%d", i + 1))) if(ImGui::BeginTabItem(va("#%d", i + 1)))
@ -1768,6 +1768,7 @@ void VolumetricLight::DrawGUI()
} }
ImGui::EndTabBar(); ImGui::EndTabBar();
}
if(SaveFileDialog_Do()) if(SaveFileDialog_Do())
{ {

4
code/renderer/rhi_d3d12.cpp
View file

@ -3137,13 +3137,15 @@ namespace RHI
{ {
if(ImGui::Begin("Direct3D 12 RHI", &resourcesActive)) if(ImGui::Begin("Direct3D 12 RHI", &resourcesActive))
{ {
ImGui::BeginTabBar("Tabs#RHI"); if(ImGui::BeginTabBar("Tabs#RHI"))
{
DrawSection("Resources", &DrawResourceUsage); DrawSection("Resources", &DrawResourceUsage);
DrawSection("Caps", &DrawCaps); DrawSection("Caps", &DrawCaps);
DrawSection("Textures", &DrawTextures); DrawSection("Textures", &DrawTextures);
DrawSection("Buffers", &DrawBuffers); DrawSection("Buffers", &DrawBuffers);
ImGui::EndTabBar(); ImGui::EndTabBar();
} }
}
ImGui::End(); ImGui::End();
} }
} }

4
code/renderer/tr_gui.cpp
View file

@ -1802,7 +1802,8 @@ static void DrawSettings()
DrawFilter(cvarFilter, sizeof(cvarFilter)); DrawFilter(cvarFilter, sizeof(cvarFilter));
ImGui::NewLine(); ImGui::NewLine();
ImGui::BeginTabBar("Tabs#ClientSettings"); if(ImGui::BeginTabBar("Tabs#ClientSettings"))
{
if(ImGui::BeginTabItem("All")) if(ImGui::BeginTabItem("All"))
{ {
DrawCVarTable(&restartNeeded, "All settings", -1); DrawCVarTable(&restartNeeded, "All settings", -1);
@ -1860,6 +1861,7 @@ static void DrawSettings()
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
ImGui::EndTabBar(); ImGui::EndTabBar();
}
DrawVideoRestart(restartNeeded); DrawVideoRestart(restartNeeded);
} }