|
@@ -1919,7 +1919,6 @@ struct ImGuiContext
|
|
|
|
|
|
// Render
|
|
|
float DimBgRatio; // 0.0..1.0 animation when fading in a dimming background (for modal window and CTRL+TAB list)
|
|
|
- ImGuiMouseCursor MouseCursor;
|
|
|
|
|
|
// Drag and Drop
|
|
|
bool DragDropActive;
|
|
@@ -1961,11 +1960,14 @@ struct ImGuiContext
|
|
|
// Hover Delay system
|
|
|
ImGuiID HoverDelayId;
|
|
|
ImGuiID HoverDelayIdPreviousFrame;
|
|
|
- float HoverDelayTimer; // Currently used IsItemHovered(), generally inferred from g.HoveredIdTimer but kept uncleared until clear timer elapse.
|
|
|
- float HoverDelayClearTimer; // Currently used IsItemHovered(): grace time before g.TooltipHoverTimer gets cleared.
|
|
|
+ float HoverDelayTimer; // Currently used by IsItemHovered()
|
|
|
+ float HoverDelayClearTimer; // Currently used by IsItemHovered(): grace time before g.TooltipHoverTimer gets cleared.
|
|
|
|
|
|
- // Widget state
|
|
|
+ // Mouse state
|
|
|
+ ImGuiMouseCursor MouseCursor;
|
|
|
ImVec2 MouseLastValidPos;
|
|
|
+
|
|
|
+ // Widget state
|
|
|
ImGuiInputTextState InputTextState;
|
|
|
ImGuiInputTextDeactivatedState InputTextDeactivatedState;
|
|
|
ImFont InputTextPasswordFont;
|
|
@@ -2142,7 +2144,6 @@ struct ImGuiContext
|
|
|
NavWindowingToggleLayer = false;
|
|
|
|
|
|
DimBgRatio = 0.0f;
|
|
|
- MouseCursor = ImGuiMouseCursor_Arrow;
|
|
|
|
|
|
DragDropActive = DragDropWithinSource = DragDropWithinTarget = false;
|
|
|
DragDropSourceFlags = ImGuiDragDropFlags_None;
|
|
@@ -2165,6 +2166,8 @@ struct ImGuiContext
|
|
|
HoverDelayId = HoverDelayIdPreviousFrame = 0;
|
|
|
HoverDelayTimer = HoverDelayClearTimer = 0.0f;
|
|
|
|
|
|
+ MouseCursor = ImGuiMouseCursor_Arrow;
|
|
|
+
|
|
|
TempInputId = 0;
|
|
|
ColorEditOptions = ImGuiColorEditFlags_DefaultOptions_;
|
|
|
ColorEditCurrentID = ColorEditSavedID = 0;
|