|
@@ -2297,7 +2297,7 @@ void ImGui::RenderNavHighlight(const ImRect& bb, ImGuiID id, ImGuiNavHighlightFl
|
|
|
return;
|
|
|
if (g.NavDisableHighlight && !(flags & ImGuiNavHighlightFlags_AlwaysDraw))
|
|
|
return;
|
|
|
- ImGuiWindow* window = ImGui::GetCurrentWindow();
|
|
|
+ ImGuiWindow* window = g.CurrentWindow;
|
|
|
if (window->DC.NavHideHighlightOneFrame)
|
|
|
return;
|
|
|
|
|
@@ -3632,7 +3632,7 @@ void ImGui::Render()
|
|
|
IM_ASSERT(g.Initialized);
|
|
|
|
|
|
if (g.FrameCountEnded != g.FrameCount)
|
|
|
- ImGui::EndFrame();
|
|
|
+ EndFrame();
|
|
|
g.FrameCountRendered = g.FrameCount;
|
|
|
|
|
|
// Gather ImDrawList to render (for each active window)
|
|
@@ -5100,7 +5100,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
|
|
|
/*
|
|
|
if (g.ActiveId == move_id)
|
|
|
if (g.IO.KeyCtrl && IsKeyPressedMap(ImGuiKey_C))
|
|
|
- ImGui::LogToClipboard();
|
|
|
+ LogToClipboard();
|
|
|
*/
|
|
|
|
|
|
// Inner rectangle
|
|
@@ -5168,13 +5168,13 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_first_use,
|
|
|
{
|
|
|
// Old API feature: we could pass the initial window size as a parameter. This was misleading because it only had an effect if the window didn't have data in the .ini file.
|
|
|
if (size_first_use.x != 0.0f || size_first_use.y != 0.0f)
|
|
|
- ImGui::SetNextWindowSize(size_first_use, ImGuiCond_FirstUseEver);
|
|
|
+ SetNextWindowSize(size_first_use, ImGuiCond_FirstUseEver);
|
|
|
|
|
|
// Old API feature: override the window background alpha with a parameter.
|
|
|
if (bg_alpha_override >= 0.0f)
|
|
|
- ImGui::SetNextWindowBgAlpha(bg_alpha_override);
|
|
|
+ SetNextWindowBgAlpha(bg_alpha_override);
|
|
|
|
|
|
- return ImGui::Begin(name, p_open, flags);
|
|
|
+ return Begin(name, p_open, flags);
|
|
|
}
|
|
|
#endif // IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
|