Skip to content

Commit

Permalink
Update ImGuiMod and ImGui.TreePush
Browse files Browse the repository at this point in the history
  • Loading branch information
brainiac committed Jan 10, 2024
1 parent f20521d commit 21edbfc
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions imgui/imgui.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1464,9 +1464,9 @@ function ImGui.TreeNodeEx(strId, flags, fmt, ...) end
function ImGui.TreeNodeEx(objId, flags, fmt, ...) end

-- ~ Indent()+PushId(). Already called by TreeNode() when returning true, but you can call TreePush/TreePop yourself if desired.
---@param strId? string Id string, or nil
---@param strId string Id string, or nil
function ImGui.TreePush(strId) end
---@param objId any Create id from any object
---@param objId? any Create id from any object
function ImGui.TreePush(objId) end

-- ~ Unindent()+PopId()
Expand Down
15 changes: 8 additions & 7 deletions imgui/imgui_enums.lua
Original file line number Diff line number Diff line change
Expand Up @@ -631,13 +631,14 @@ ImGuiKey = {
-- backends tend to interfere and break that equivalence. The safer decision is to relay that ambiguity down to the end-user...
---@enum ImGuiMod
ImGuiMod = {
None = 0,
Ctrl = 0x1000, -- Ctrl
Shift = 0x2000, -- Shift
Alt = 0x4000, -- Option/Menu
Super = 0x8000, -- Cmd/Super/Windows
Shortcut = 0x0800, -- Alias for Ctrl (non-macOS) _or_ Super (macOS).
Mask_ = 0xF800, -- 5-bits
None = 0,
Ctrl = 0x1000, -- Ctrl
Shift = 0x2000, -- Shift
Alt = 0x4000, -- Option/Menu
Super = 0x8000, -- Cmd/Super/Windows
Shortcut = 0x0800, -- Alias for Ctrl (non-macOS) _or_ Super (macOS).

Mask_ = 0xF800, -- 5-bits
}


Expand Down

0 comments on commit 21edbfc

Please sign in to comment.