Skip to content

Commit

Permalink
Fixed botched merge
Browse files Browse the repository at this point in the history
  • Loading branch information
corentin-plouet committed Apr 23, 2020
1 parent 1ee15ba commit 56ed656
Showing 1 changed file with 0 additions and 17 deletions.
17 changes: 0 additions & 17 deletions imgui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3740,23 +3740,6 @@ void ImGui::SetMaxWaitBeforeNextFrame(double time)
g.MaxWaitBeforeNextFrame = ImMin(g.MaxWaitBeforeNextFrame, time);
}

double ImGui::GetEventWaitingTime()
{
ImGuiContext& g = *GImGui;

if ((g.IO.ConfigFlags & ImGuiConfigFlags_EnablePowerSavingMode) && g.IO.FrameCountSinceLastInput > 2)
return ImMax(0.0, g.MaxWaitBeforeNextFrame);

return 0.0;
}

void ImGui::SetMaxWaitBeforeNextFrame(double time)
{
ImGuiContext& g = *GImGui;

g.MaxWaitBeforeNextFrame = ImMin(g.MaxWaitBeforeNextFrame, time);
}

void ImGui::NewFrame()
{
IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
Expand Down

0 comments on commit 56ed656

Please sign in to comment.