Skip to content

Commit 5e717dc

Browse files
authored
Merge pull request #1430 from MadLadSquad/auto
Update
2 parents 0cf0f54 + 23b93ff commit 5e717dc

File tree

3 files changed

+21
-4
lines changed

3 files changed

+21
-4
lines changed

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

+5
Original file line numberDiff line numberDiff line change
@@ -2421,6 +2421,11 @@ CIMGUI_API bool cimgui::ImGui_IsMouseDoubleClicked(ImGuiMouseButton
24212421
return ::ImGui::IsMouseDoubleClicked(button);
24222422
}
24232423

2424+
CIMGUI_API bool cimgui::ImGui_IsMouseReleasedWithDelay(ImGuiMouseButton button, float delay)
2425+
{
2426+
return ::ImGui::IsMouseReleasedWithDelay(button, delay);
2427+
}
2428+
24242429
CIMGUI_API int cimgui::ImGui_GetMouseClickedCount(ImGuiMouseButton button)
24252430
{
24262431
return ::ImGui::GetMouseClickedCount(button);

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

+15-3
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.8 WIP"
36-
#define IMGUI_VERSION_NUM 19172
36+
#define IMGUI_VERSION_NUM 19173
3737
#define IMGUI_HAS_TABLE
3838
#define IMGUI_HAS_VIEWPORT // Viewport WIP branch
3939
#define IMGUI_HAS_DOCK // Docking WIP branch
@@ -1127,6 +1127,7 @@ CIMGUI_API bool ImGui_IsMouseClicked(ImGuiMouseButton button);
11271127
CIMGUI_API bool ImGui_IsMouseClickedEx(ImGuiMouseButton button, bool repeat /* = false */); // did mouse button clicked? (went from !Down to Down). Same as GetMouseClickedCount() == 1.
11281128
CIMGUI_API bool ImGui_IsMouseReleased(ImGuiMouseButton button); // did mouse button released? (went from Down to !Down)
11291129
CIMGUI_API bool ImGui_IsMouseDoubleClicked(ImGuiMouseButton button); // did mouse button double-clicked? Same as GetMouseClickedCount() == 2. (note that a double-click will also report IsMouseClicked() == true)
1130+
CIMGUI_API bool ImGui_IsMouseReleasedWithDelay(ImGuiMouseButton button, float delay); // delayed mouse release (use very sparingly!). Generally used with 'delay >= io.MouseDoubleClickTime' + combined with a 'io.MouseClickedLastCount==1' test. This is a very rarely used UI idiom, but some apps use this: e.g. MS Explorer single click on an icon to rename.
11301131
CIMGUI_API int ImGui_GetMouseClickedCount(ImGuiMouseButton button); // return the number of successive mouse-clicks at the time where a click happen (otherwise 0).
11311132
CIMGUI_API bool ImGui_IsMouseHoveringRect(ImVec2 r_min, ImVec2 r_max); // Implied clip = true
11321133
CIMGUI_API bool ImGui_IsMouseHoveringRectEx(ImVec2 r_min, ImVec2 r_max, bool clip /* = true */); // is mouse hovering given bounding rect (in screen space). clipped by current clipping settings, but disregarding of other consideration of focus/window ordering/popup-block.
@@ -1996,10 +1997,16 @@ typedef enum
19961997
ImGuiColorEditFlags_NoDragDrop = 1<<9, // // ColorEdit: disable drag and drop target. ColorButton: disable drag and drop source.
19971998
ImGuiColorEditFlags_NoBorder = 1<<10, // // ColorButton: disable border (which is enforced by default)
19981999

2000+
// Alpha preview
2001+
// - Prior to 1.91.8 (2025/01/21): alpha was made opaque in the preview by default using old name ImGuiColorEditFlags_AlphaPreview.
2002+
// - We now display the preview as transparent by default. You can use ImGuiColorEditFlags_AlphaOpaque to use old behavior.
2003+
// - The new flags may be combined better and allow finer controls.
2004+
ImGuiColorEditFlags_AlphaOpaque = 1<<11, // // ColorEdit, ColorPicker, ColorButton: disable alpha in the preview,. Contrary to _NoAlpha it may still be edited when calling ColorEdit4()/ColorPicker4(). For ColorButton() this does the same as _NoAlpha.
2005+
ImGuiColorEditFlags_AlphaNoBg = 1<<12, // // ColorEdit, ColorPicker, ColorButton: disable rendering a checkerboard background behind transparent color.
2006+
ImGuiColorEditFlags_AlphaPreviewHalf = 1<<13, // // ColorEdit, ColorPicker, ColorButton: display half opaque / half transparent preview.
2007+
19992008
// User Options (right-click on widget to change some of them).
20002009
ImGuiColorEditFlags_AlphaBar = 1<<16, // // ColorEdit, ColorPicker: show vertical alpha bar/gradient in picker.
2001-
ImGuiColorEditFlags_AlphaPreview = 1<<17, // // ColorEdit, ColorPicker, ColorButton: display preview as a transparent color over a checkerboard, instead of opaque.
2002-
ImGuiColorEditFlags_AlphaPreviewHalf = 1<<18, // // ColorEdit, ColorPicker, ColorButton: display half opaque / half checkerboard, instead of opaque.
20032010
ImGuiColorEditFlags_HDR = 1<<19, // // (WIP) ColorEdit: Currently only disable 0.0f..1.0f limits in RGBA edition (note: you probably want to use ImGuiColorEditFlags_Float flag as well).
20042011
ImGuiColorEditFlags_DisplayRGB = 1<<20, // [Display] // ColorEdit: override _display_ type among RGB/HSV/Hex. ColorPicker: select any combination using one or more of RGB/HSV/Hex.
20052012
ImGuiColorEditFlags_DisplayHSV = 1<<21, // [Display] // "
@@ -2016,12 +2023,16 @@ typedef enum
20162023
ImGuiColorEditFlags_DefaultOptions_ = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_PickerHueBar,
20172024

20182025
// [Internal] Masks
2026+
ImGuiColorEditFlags_AlphaMask_ = ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaOpaque | ImGuiColorEditFlags_AlphaNoBg | ImGuiColorEditFlags_AlphaPreviewHalf,
20192027
ImGuiColorEditFlags_DisplayMask_ = ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV | ImGuiColorEditFlags_DisplayHex,
20202028
ImGuiColorEditFlags_DataTypeMask_ = ImGuiColorEditFlags_Uint8 | ImGuiColorEditFlags_Float,
20212029
ImGuiColorEditFlags_PickerMask_ = ImGuiColorEditFlags_PickerHueWheel | ImGuiColorEditFlags_PickerHueBar,
20222030
ImGuiColorEditFlags_InputMask_ = ImGuiColorEditFlags_InputRGB | ImGuiColorEditFlags_InputHSV,
20232031

20242032
// Obsolete names
2033+
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2034+
ImGuiColorEditFlags_AlphaPreview = 0, // [Removed in 1.91.8] This is the default now. Will display a checkerboard unless ImGuiColorEditFlags_AlphaNoBg is set.
2035+
#endif // #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
20252036
//ImGuiColorEditFlags_RGB = ImGuiColorEditFlags_DisplayRGB, ImGuiColorEditFlags_HSV = ImGuiColorEditFlags_DisplayHSV, ImGuiColorEditFlags_HEX = ImGuiColorEditFlags_DisplayHex // [renamed in 1.69]
20262037
} ImGuiColorEditFlags_;
20272038

@@ -2597,6 +2608,7 @@ struct ImGuiIO_t
25972608
ImU16 MouseClickedCount[5]; // == 0 (not clicked), == 1 (same as MouseClicked[]), == 2 (double-clicked), == 3 (triple-clicked) etc. when going from !Down to Down
25982609
ImU16 MouseClickedLastCount[5]; // Count successive number of clicks. Stays valid after mouse release. Reset after another click is done.
25992610
bool MouseReleased[5]; // Mouse button went from Down to !Down
2611+
double MouseReleasedTime[5]; // Time of last released (rarely used! but useful to handle delayed single-click when trying to disambiguate them from double-click).
26002612
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.
26012613
bool MouseDownOwnedUnlessPopupClose[5]; // Track if button was clicked inside a dear imgui window.
26022614
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.

0 commit comments

Comments
 (0)