Moved push and pop style into imgui_render

d3d11
FlightlessMango 4 years ago
parent 8705da70a7
commit 2778618f36

@ -197,7 +197,6 @@ void imgui_render(unsigned int width, unsigned int height)
position_layer(params, window_size);
render_imgui(sw_stats, params, window_size, "OpenGL");
}
ImGui::PopStyleVar(3);
ImGui::Render();
ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData());

@ -1026,9 +1026,6 @@ void position_layer(struct overlay_params& params, ImVec2 window_size)
ImGui::SetNextWindowBgAlpha(params.background_alpha);
ImGui::SetNextWindowSize(window_size, ImGuiCond_Always);
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8,-3));
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, params.alpha);
switch (params.position) {
case LAYER_POSITION_TOP_LEFT:
@ -1146,6 +1143,10 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
unsigned width = ImGui::GetIO().DisplaySize.x;
unsigned height = ImGui::GetIO().DisplaySize.y;
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8,-3));
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, params.alpha);
if (!params.no_display){
ImGui::Begin("Main", &open, ImGuiWindowFlags_NoDecoration);
if (params.enabled[OVERLAY_PARAM_ENABLED_time]){
@ -1401,6 +1402,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
ImGui::End();
}
}
ImGui::PopStyleVar(3);
}
static void compute_swapchain_display(struct swapchain_data *data)
@ -1415,7 +1417,6 @@ static void compute_swapchain_display(struct swapchain_data *data)
position_layer(instance_data->params, data->window_size);
render_imgui(data->sw_stats, instance_data->params, data->window_size, "Vulkan");
}
ImGui::PopStyleVar(3);
ImGui::EndFrame();
ImGui::Render();

Loading…
Cancel
Save