Skip to content

Commit 50ff6de

Browse files
authored
Merge pull request #1412 from MadLadSquad/auto
Update
2 parents 3b8cc13 + 9325d28 commit 50ff6de

File tree

3 files changed

+27
-25
lines changed

3 files changed

+27
-25
lines changed

Framework/ThirdParty/freetype

Framework/ThirdParty/source-libraries/cimgui/cimgui.h

+25-23
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// **DO NOT EDIT DIRECTLY**
33
// https://github.com/dearimgui/dear_bindings
44

5-
// dear imgui, v1.91.7 WIP
5+
// dear imgui, v1.91.7
66
// (headers)
77

88
// Help:
@@ -32,8 +32,8 @@
3232

3333
// Library Version
3434
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
35-
#define IMGUI_VERSION "1.91.7 WIP"
36-
#define IMGUI_VERSION_NUM 19164
35+
#define IMGUI_VERSION "1.91.7"
36+
#define IMGUI_VERSION_NUM 19170
3737
#define IMGUI_HAS_TABLE
3838
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3939
#define IMGUI_HAS_DOCK // Docking WIP branch
@@ -1226,8 +1226,8 @@ typedef enum
12261226

12271227
// Obsolete names
12281228
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
1229+
ImGuiWindowFlags_NavFlattened = 1<<29, // Obsoleted in 1.90.9: Use ImGuiChildFlags_NavFlattened in BeginChild() call.
12291230
ImGuiWindowFlags_AlwaysUseWindowPadding = 1<<30, // Obsoleted in 1.90.0: Use ImGuiChildFlags_AlwaysUseWindowPadding in BeginChild() call.
1230-
ImGuiWindowFlags_NavFlattened = 1<<31, // Obsoleted in 1.90.9: Use ImGuiChildFlags_NavFlattened in BeginChild() call.
12311231
#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
12321232
} ImGuiWindowFlags_;
12331233

@@ -1309,7 +1309,7 @@ typedef enum
13091309
ImGuiInputTextFlags_CallbackAlways = 1<<20, // Callback on each iteration. User code may query cursor position, modify text buffer.
13101310
ImGuiInputTextFlags_CallbackCharFilter = 1<<21, // Callback on character inputs to replace or discard them. Modify 'EventChar' to replace or discard, or return 1 in callback to discard.
13111311
ImGuiInputTextFlags_CallbackResize = 1<<22, // Callback on buffer capacity changes request (beyond 'buf_size' parameter value), allowing the string to grow. Notify when the string wants to be resized (for string types which hold a cache of their Size). You will be provided a new BufSize in the callback and NEED to honor it. (see misc/cpp/imgui_stdlib.h for an example of using this)
1312-
ImGuiInputTextFlags_CallbackEdit = 1<<23, // 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)
1312+
ImGuiInputTextFlags_CallbackEdit = 1<<23, // Callback on any edit. Note that InputText() already returns true on edit + you can always use IsItemEdited(). The callback is useful to manipulate the underlying buffer while focus is active.
13131313

13141314
// Obsolete names
13151315
//ImGuiInputTextFlags_AlwaysInsertMode = ImGuiInputTextFlags_AlwaysOverwrite // [renamed in 1.82] name was not matching behavior
@@ -1319,27 +1319,29 @@ typedef enum
13191319
typedef enum
13201320
{
13211321
ImGuiTreeNodeFlags_None = 0,
1322-
ImGuiTreeNodeFlags_Selected = 1<<0, // Draw as selected
1323-
ImGuiTreeNodeFlags_Framed = 1<<1, // Draw frame with background (e.g. for CollapsingHeader)
1324-
ImGuiTreeNodeFlags_AllowOverlap = 1<<2, // Hit testing to allow subsequent widgets to overlap this one
1325-
ImGuiTreeNodeFlags_NoTreePushOnOpen = 1<<3, // Don't do a TreePush() when open (e.g. for CollapsingHeader) = no extra indent nor pushing on ID stack
1326-
ImGuiTreeNodeFlags_NoAutoOpenOnLog = 1<<4, // Don't automatically and temporarily open node when Logging is active (by default logging will automatically open tree nodes)
1327-
ImGuiTreeNodeFlags_DefaultOpen = 1<<5, // Default node to be open
1328-
ImGuiTreeNodeFlags_OpenOnDoubleClick = 1<<6, // Open on double-click instead of simple click (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined.
1329-
ImGuiTreeNodeFlags_OpenOnArrow = 1<<7, // Open when clicking on the arrow part (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined.
1330-
ImGuiTreeNodeFlags_Leaf = 1<<8, // No collapsing, no arrow (use as a convenience for leaf nodes).
1331-
ImGuiTreeNodeFlags_Bullet = 1<<9, // Display a bullet instead of arrow. IMPORTANT: node can still be marked open/close if you don't set the _Leaf flag!
1332-
ImGuiTreeNodeFlags_FramePadding = 1<<10, // Use FramePadding (even for an unframed text node) to vertically align text baseline to regular widget height. Equivalent to calling AlignTextToFramePadding() before the node.
1333-
ImGuiTreeNodeFlags_SpanAvailWidth = 1<<11, // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line without using AllowOverlap mode.
1334-
ImGuiTreeNodeFlags_SpanFullWidth = 1<<12, // Extend hit box to the left-most and right-most edges (cover the indent area).
1335-
ImGuiTreeNodeFlags_SpanTextWidth = 1<<13, // Narrow hit box + narrow hovering highlight, will only cover the label text.
1336-
ImGuiTreeNodeFlags_SpanAllColumns = 1<<14, // Frame will span all columns of its container table (text will still fit in current column)
1337-
ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1<<15, // (WIP) Nav: left direction may move to this TreeNode() from any of its child (items submitted between TreeNode and TreePop)
1322+
ImGuiTreeNodeFlags_Selected = 1<<0, // Draw as selected
1323+
ImGuiTreeNodeFlags_Framed = 1<<1, // Draw frame with background (e.g. for CollapsingHeader)
1324+
ImGuiTreeNodeFlags_AllowOverlap = 1<<2, // Hit testing to allow subsequent widgets to overlap this one
1325+
ImGuiTreeNodeFlags_NoTreePushOnOpen = 1<<3, // Don't do a TreePush() when open (e.g. for CollapsingHeader) = no extra indent nor pushing on ID stack
1326+
ImGuiTreeNodeFlags_NoAutoOpenOnLog = 1<<4, // Don't automatically and temporarily open node when Logging is active (by default logging will automatically open tree nodes)
1327+
ImGuiTreeNodeFlags_DefaultOpen = 1<<5, // Default node to be open
1328+
ImGuiTreeNodeFlags_OpenOnDoubleClick = 1<<6, // Open on double-click instead of simple click (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined.
1329+
ImGuiTreeNodeFlags_OpenOnArrow = 1<<7, // Open when clicking on the arrow part (default for multi-select unless any _OpenOnXXX behavior is set explicitly). Both behaviors may be combined.
1330+
ImGuiTreeNodeFlags_Leaf = 1<<8, // No collapsing, no arrow (use as a convenience for leaf nodes).
1331+
ImGuiTreeNodeFlags_Bullet = 1<<9, // Display a bullet instead of arrow. IMPORTANT: node can still be marked open/close if you don't set the _Leaf flag!
1332+
ImGuiTreeNodeFlags_FramePadding = 1<<10, // Use FramePadding (even for an unframed text node) to vertically align text baseline to regular widget height. Equivalent to calling AlignTextToFramePadding() before the node.
1333+
ImGuiTreeNodeFlags_SpanAvailWidth = 1<<11, // Extend hit box to the right-most edge, even if not framed. This is not the default in order to allow adding other items on the same line without using AllowOverlap mode.
1334+
ImGuiTreeNodeFlags_SpanFullWidth = 1<<12, // Extend hit box to the left-most and right-most edges (cover the indent area).
1335+
ImGuiTreeNodeFlags_SpanLabelWidth = 1<<13, // Narrow hit box + narrow hovering highlight, will only cover the label text.
1336+
ImGuiTreeNodeFlags_SpanAllColumns = 1<<14, // Frame will span all columns of its container table (label will still fit in current column)
1337+
ImGuiTreeNodeFlags_LabelSpanAllColumns = 1<<15, // Label will span all columns of its container table
13381338
//ImGuiTreeNodeFlags_NoScrollOnOpen = 1 << 16, // FIXME: TODO: Disable automatic scroll on TreePop() if node got just open and contents is not visible
1339+
ImGuiTreeNodeFlags_NavLeftJumpsBackHere = 1<<17, // (WIP) Nav: left direction may move to this TreeNode() from any of its child (items submitted between TreeNode and TreePop)
13391340
ImGuiTreeNodeFlags_CollapsingHeader = ImGuiTreeNodeFlags_Framed | ImGuiTreeNodeFlags_NoTreePushOnOpen | ImGuiTreeNodeFlags_NoAutoOpenOnLog,
13401341

13411342
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
1342-
ImGuiTreeNodeFlags_AllowItemOverlap = ImGuiTreeNodeFlags_AllowOverlap, // Renamed in 1.89.7
1343+
ImGuiTreeNodeFlags_AllowItemOverlap = ImGuiTreeNodeFlags_AllowOverlap, // Renamed in 1.89.7
1344+
ImGuiTreeNodeFlags_SpanTextWidth = ImGuiTreeNodeFlags_SpanLabelWidth, // Renamed in 1.90.7
13431345
#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
13441346
} ImGuiTreeNodeFlags_;
13451347

@@ -2654,7 +2656,7 @@ CIMGUI_API void ImGuiIO_ClearInputCharacters(ImGuiIO* self); // [Obsoleted in 1
26542656
// Shared state of InputText(), passed as an argument to your callback when a ImGuiInputTextFlags_Callback* flag is used.
26552657
// The callback function should return 0 by default.
26562658
// Callbacks (follow a flag name and see comments in ImGuiInputTextFlags_ declarations for more details)
2657-
// - ImGuiInputTextFlags_CallbackEdit: Callback on buffer edit (note that InputText() already returns true on edit, the callback is useful mainly to manipulate the underlying buffer while focus is active)
2659+
// - ImGuiInputTextFlags_CallbackEdit: Callback on buffer edit. Note that InputText() already returns true on edit + you can always use IsItemEdited(). The callback is useful to manipulate the underlying buffer while focus is active.
26582660
// - ImGuiInputTextFlags_CallbackAlways: Callback on each iteration
26592661
// - ImGuiInputTextFlags_CallbackCompletion: Callback on pressing TAB
26602662
// - ImGuiInputTextFlags_CallbackHistory: Callback on pressing Up/Down arrows

0 commit comments

Comments
 (0)