|
|
@@ -1,4 +1,4 @@
|
|
|
-// dear imgui, v1.89.4 WIP
|
|
|
+// dear imgui, v1.89.4
|
|
|
// (headers)
|
|
|
|
|
|
// Help:
|
|
|
@@ -22,8 +22,8 @@
|
|
|
|
|
|
// Library Version
|
|
|
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM > 12345')
|
|
|
-#define IMGUI_VERSION "1.89.4 WIP"
|
|
|
-#define IMGUI_VERSION_NUM 18936
|
|
|
+#define IMGUI_VERSION "1.89.4"
|
|
|
+#define IMGUI_VERSION_NUM 18940
|
|
|
#define IMGUI_HAS_TABLE
|
|
|
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
|
|
|
#define IMGUI_HAS_DOCK // Docking WIP branch
|
|
|
@@ -1059,10 +1059,8 @@ enum ImGuiInputTextFlags_
|
|
|
ImGuiInputTextFlags_CallbackEdit = 1 << 19, // Callback on any edit (note that InputText() already returns true on edit, the callback is useful mainly to manipulate the underlying buffer while focus is active)
|
|
|
ImGuiInputTextFlags_EscapeClearsAll = 1 << 20, // Escape key clears content if not empty, and deactivate otherwise (contrast to default behavior of Escape to revert)
|
|
|
|
|
|
- // Obsolete names (will be removed soon)
|
|
|
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
- ImGuiInputTextFlags_AlwaysInsertMode = ImGuiInputTextFlags_AlwaysOverwrite // [renamed in 1.82] name was not matching behavior
|
|
|
-#endif
|
|
|
+ // Obsolete names
|
|
|
+ //ImGuiInputTextFlags_AlwaysInsertMode = ImGuiInputTextFlags_AlwaysOverwrite // [renamed in 1.82] name was not matching behavior
|
|
|
};
|
|
|
|
|
|
// Flags for ImGui::TreeNodeEx(), ImGui::CollapsingHeader*()
|
|
|
@@ -1745,8 +1743,8 @@ enum ImGuiColorEditFlags_
|
|
|
ImGuiColorEditFlags_PickerMask_ = ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_PickerHueBar,
|
|
|
ImGuiColorEditFlags_InputMask_ = ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_InputHSV,
|
|
|
|
|
|
- // Obsolete names (will be removed)
|
|
|
- // ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex // [renamed in 1.69]
|
|
|
+ // Obsolete names
|
|
|
+ //ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex // [renamed in 1.69]
|
|
|
};
|
|
|
|
|
|
// Flags for DragFloat(), DragInt(), SliderFloat(), SliderInt() etc.
|
|
|
@@ -1761,10 +1759,8 @@ enum ImGuiSliderFlags_
|
|
|
ImGuiSliderFlags_NoInput = 1 << 7, // Disable CTRL+Click or Enter key allowing to input text directly into the widget
|
|
|
ImGuiSliderFlags_InvalidMask_ = 0x7000000F, // [Internal] We treat using those bits as being potentially a 'float power' argument from the previous API that has got miscast to this enum, and will trigger an assert if needed.
|
|
|
|
|
|
- // Obsolete names (will be removed)
|
|
|
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
- ImGuiSliderFlags_ClampOnInput = ImGuiSliderFlags_AlwaysClamp, // [renamed in 1.79]
|
|
|
-#endif
|
|
|
+ // Obsolete names
|
|
|
+ //ImGuiSliderFlags_ClampOnInput = ImGuiSliderFlags_AlwaysClamp, // [renamed in 1.79]
|
|
|
};
|
|
|
|
|
|
// Identify a mouse button.
|
|
|
@@ -2028,6 +2024,14 @@ struct ImGuiIO
|
|
|
bool ConfigWindowsMoveFromTitleBarOnly; // = false // Enable allowing to move windows only when clicking on their title bar. Does not apply to windows without a title bar.
|
|
|
float ConfigMemoryCompactTimer; // = 60.0f // Timer (in seconds) to free transient windows/tables memory buffers when unused. Set to -1.0f to disable.
|
|
|
|
|
|
+ // Debug options
|
|
|
+ // - tools to test correct Begin/End and BeginChild/EndChild behaviors.
|
|
|
+ // - presently Begn()/End() and BeginChild()EndChild() needs to ALWAYS be called in tandem, regardless of return value of BeginXXX()
|
|
|
+ // this is inconsistent with other BeginXXX functions and create confusion for many users.
|
|
|
+ // - we expect to update the API eventually. In the meanwhile we provided tools to facilitate checking user-code behavior.
|
|
|
+ bool ConfigDebugBeginReturnValueOnce; // = false // First-time calls to Begin()/BeginChild() will return false. NEEDS TO BE SET AT APPLICATION BOOT TIME if you don't want to miss windows.
|
|
|
+ bool ConfigDebugBeginReturnValueLoop; // = false // Some calls to Begin()/BeginChild() will return false. Will cycle through window depths then repeat. Suggested use: add "io.ConfigDebugBeginReturnValue = io.KeyShift" in your main loop then occasionally press SHIFT. Windows should be flickering while running.
|
|
|
+
|
|
|
//------------------------------------------------------------------
|
|
|
// Platform Functions
|
|
|
// (the imgui_impl_xxxx backend files are setting those up for you)
|
|
|
@@ -2752,10 +2756,9 @@ struct ImDrawList
|
|
|
inline void PrimWriteIdx(ImDrawIdx idx) { *_IdxWritePtr = idx; _IdxWritePtr++; }
|
|
|
inline void PrimVtx(const ImVec2& pos, const ImVec2& uv, ImU32 col) { PrimWriteIdx((ImDrawIdx)_VtxCurrentIdx); PrimWriteVtx(pos, uv, col); } // Write vertex with unique index
|
|
|
|
|
|
-#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
|
|
- inline void AddBezierCurve(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0) { AddBezierCubic(p1, p2, p3, p4, col, thickness, num_segments); } // OBSOLETED in 1.80 (Jan 2021)
|
|
|
- inline void PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0) { PathBezierCubicCurveTo(p2, p3, p4, num_segments); } // OBSOLETED in 1.80 (Jan 2021)
|
|
|
-#endif
|
|
|
+ // Obsolete names
|
|
|
+ //inline void AddBezierCurve(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, ImU32 col, float thickness, int num_segments = 0) { AddBezierCubic(p1, p2, p3, p4, col, thickness, num_segments); } // OBSOLETED in 1.80 (Jan 2021)
|
|
|
+ //inline void PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImVec2& p4, int num_segments = 0) { PathBezierCubicCurveTo(p2, p3, p4, num_segments); } // OBSOLETED in 1.80 (Jan 2021)
|
|
|
|
|
|
// [Internal helpers]
|
|
|
IMGUI_API void _ResetForNewFrame();
|
ocornut