mirror of https://github.com/bkaradzic/bgfx
Updated ImGui.
This commit is contained in:
parent
f6f6a22119
commit
7b031cd3d4
|
@ -992,9 +992,6 @@ static const float WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER = 0.04f; // Reduc
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
|
||||||
static void SetCurrentWindow(ImGuiWindow* window);
|
static void SetCurrentWindow(ImGuiWindow* window);
|
||||||
static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond);
|
|
||||||
static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond);
|
|
||||||
static void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond);
|
|
||||||
static void FindHoveredWindow();
|
static void FindHoveredWindow();
|
||||||
static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags);
|
static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags);
|
||||||
static void CheckStacksSize(ImGuiWindow* window, bool write);
|
static void CheckStacksSize(ImGuiWindow* window, bool write);
|
||||||
|
@ -6037,7 +6034,7 @@ void ImGui::SetWindowScrollY(ImGuiWindow* window, float new_scroll_y)
|
||||||
window->DC.CursorMaxPos.y -= window->Scroll.y;
|
window->DC.CursorMaxPos.y -= window->Scroll.y;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
|
void ImGui::SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
|
||||||
{
|
{
|
||||||
// Test condition (NB: bit 0 is always true) and clear flags for next time
|
// Test condition (NB: bit 0 is always true) and clear flags for next time
|
||||||
if (cond && (window->SetWindowPosAllowFlags & cond) == 0)
|
if (cond && (window->SetWindowPosAllowFlags & cond) == 0)
|
||||||
|
@ -6072,7 +6069,7 @@ ImVec2 ImGui::GetWindowSize()
|
||||||
return window->Size;
|
return window->Size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond)
|
void ImGui::SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond)
|
||||||
{
|
{
|
||||||
// Test condition (NB: bit 0 is always true) and clear flags for next time
|
// Test condition (NB: bit 0 is always true) and clear flags for next time
|
||||||
if (cond && (window->SetWindowSizeAllowFlags & cond) == 0)
|
if (cond && (window->SetWindowSizeAllowFlags & cond) == 0)
|
||||||
|
@ -6115,7 +6112,7 @@ void ImGui::SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond)
|
||||||
SetWindowSize(window, size, cond);
|
SetWindowSize(window, size, cond);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond)
|
void ImGui::SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond)
|
||||||
{
|
{
|
||||||
// Test condition (NB: bit 0 is always true) and clear flags for next time
|
// Test condition (NB: bit 0 is always true) and clear flags for next time
|
||||||
if (cond && (window->SetWindowCollapsedAllowFlags & cond) == 0)
|
if (cond && (window->SetWindowCollapsedAllowFlags & cond) == 0)
|
||||||
|
|
|
@ -1321,6 +1321,9 @@ namespace ImGui
|
||||||
IMGUI_API float GetWindowScrollMaxX(ImGuiWindow* window);
|
IMGUI_API float GetWindowScrollMaxX(ImGuiWindow* window);
|
||||||
IMGUI_API float GetWindowScrollMaxY(ImGuiWindow* window);
|
IMGUI_API float GetWindowScrollMaxY(ImGuiWindow* window);
|
||||||
IMGUI_API ImRect GetWindowAllowedExtentRect(ImGuiWindow* window);
|
IMGUI_API ImRect GetWindowAllowedExtentRect(ImGuiWindow* window);
|
||||||
|
IMGUI_API void SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond);
|
||||||
|
IMGUI_API void SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond);
|
||||||
|
IMGUI_API void SetWindowCollapsed(ImGuiWindow* window, bool collapsed, ImGuiCond cond);
|
||||||
|
|
||||||
IMGUI_API void SetCurrentFont(ImFont* font);
|
IMGUI_API void SetCurrentFont(ImFont* font);
|
||||||
inline ImFont* GetDefaultFont() { ImGuiContext& g = *GImGui; return g.IO.FontDefault ? g.IO.FontDefault : g.IO.Fonts->Fonts[0]; }
|
inline ImFont* GetDefaultFont() { ImGuiContext& g = *GImGui; return g.IO.FontDefault ? g.IO.FontDefault : g.IO.Fonts->Fonts[0]; }
|
||||||
|
|
Loading…
Reference in New Issue