Skip to content

Commit 2515620

Browse files
authored
Merge pull request #1503 from MadLadSquad/auto
Update
2 parents e532881 + 8ed8174 commit 2515620

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// Library Version
3434
// (Integer encoded as XYYZZ for use in #if preprocessor conditionals, e.g. '#if IMGUI_VERSION_NUM >= 12345')
3535
#define IMGUI_VERSION "1.91.9 WIP"
36-
#define IMGUI_VERSION_NUM 19187
36+
#define IMGUI_VERSION_NUM 19188
3737
#define IMGUI_HAS_TABLE
3838
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3939
#define IMGUI_HAS_DOCK // Docking WIP branch
@@ -577,7 +577,7 @@ CIMGUI_API void ImGui_LabelText(const char* label, const char* fmt, ...) IM_FMTA
577577
CIMGUI_API void ImGui_LabelTextV(const char* label, const char* fmt, va_list args) IM_FMTLIST(2);
578578
CIMGUI_API void ImGui_BulletText(const char* fmt, ...) IM_FMTARGS(1); // shortcut for Bullet()+Text()
579579
CIMGUI_API void ImGui_BulletTextV(const char* fmt, va_list args) IM_FMTLIST(1);
580-
CIMGUI_API void ImGui_SeparatorText(const char* label); // currently: formatted text with an horizontal line
580+
CIMGUI_API void ImGui_SeparatorText(const char* label); // currently: formatted text with a horizontal line
581581

582582
// Widgets: Main
583583
// - Most widgets return true when the value has been changed or when pressed/selected
@@ -1092,7 +1092,7 @@ CIMGUI_API bool ImGui_IsKeyPressedEx(ImGuiKey key, bool repeat /* = true
10921092
CIMGUI_API bool ImGui_IsKeyReleased(ImGuiKey key); // was key released (went from Down to !Down)?
10931093
CIMGUI_API bool ImGui_IsKeyChordPressed(ImGuiKeyChord key_chord); // was key chord (mods + key) pressed, e.g. you can pass 'ImGuiMod_Ctrl | ImGuiKey_S' as a key-chord. This doesn't do any routing or focus check, please consider using Shortcut() function instead.
10941094
CIMGUI_API int ImGui_GetKeyPressedAmount(ImGuiKey key, float repeat_delay, float rate); // uses provided repeat rate/delay. return a count, most often 0 or 1 but might be >1 if RepeatRate is small enough that DeltaTime > RepeatRate
1095-
CIMGUI_API const char* ImGui_GetKeyName(ImGuiKey key); // [DEBUG] returns English name of the key. Those names a provided for debugging purpose and are not meant to be saved persistently not compared.
1095+
CIMGUI_API const char* ImGui_GetKeyName(ImGuiKey key); // [DEBUG] returns English name of the key. Those names are provided for debugging purpose and are not meant to be saved persistently nor compared.
10961096
CIMGUI_API void ImGui_SetNextFrameWantCaptureKeyboard(bool want_capture_keyboard); // Override io.WantCaptureKeyboard flag next frame (said flag is left for your application to handle, typically when true it instructs your app to ignore inputs). e.g. force capture keyboard when your widget is being hovered. This is equivalent to setting "io.WantCaptureKeyboard = want_capture_keyboard"; after the next NewFrame() call.
10971097

10981098
// Inputs Utilities: Shortcut Testing & Routing [BETA]
@@ -1709,6 +1709,7 @@ enum // Forward declared enum
17091709
ImGuiKey_KeypadEqual,
17101710
ImGuiKey_AppBack, // Available on some keyboard/mouses. Often referred as "Browser Back"
17111711
ImGuiKey_AppForward,
1712+
ImGuiKey_Oem102, // Non-US backslash.
17121713

17131714
// Gamepad (some of those are analog values, 0.0f to 1.0f) // NAVIGATION ACTION
17141715
// (download controller mapping PNG/PSD at http://dearimgui.com/controls_sheets)
@@ -2625,7 +2626,7 @@ struct ImGuiIO_t
26252626
bool MouseDownOwned[5]; // Track if button was clicked inside a dear imgui window or over void blocked by a popup. We don't request mouse capture from the application if click started outside ImGui bounds.
26262627
bool MouseDownOwnedUnlessPopupClose[5]; // Track if button was clicked inside a dear imgui window.
26272628
bool MouseWheelRequestAxisSwap; // On a non-Mac system, holding SHIFT requests WheelY to perform the equivalent of a WheelX event. On a Mac system this is already enforced by the system.
2628-
bool MouseCtrlLeftAsRightClick; // (OSX) Set to true when the current click was a ctrl-click that spawned a simulated right click
2629+
bool MouseCtrlLeftAsRightClick; // (OSX) Set to true when the current click was a Ctrl+click that spawned a simulated right click
26292630
float MouseDownDuration[5]; // Duration the mouse button has been down (0.0f == just clicked)
26302631
float MouseDownDurationPrev[5]; // Previous time the mouse button has been down
26312632
ImVec2 MouseDragMaxDistanceAbs[5]; // Maximum distance, absolute, on each axis, of how much mouse has traveled from the clicking point

0 commit comments

Comments
 (0)