SetNextTreeOpened() and rename ShowTooltip->SetTooltip

Conflicts:
	.gitignore
	src/ImGui.NET/ImGui.cs
internals
Eric Mellino 9 years ago
parent 576e8bb272
commit 62dcdf8b48
  1. 2
      .gitignore
  2. 9
      src/ImGui.NET/ImGui.cs

2
.gitignore vendored

@ -253,4 +253,4 @@ Session.vim
.vscode .vscode
# MSVC Stuff # MSVC Stuff
*.VC.db *.VC.db

@ -788,7 +788,6 @@ namespace ImGuiNET
ImGuiNative.igNextColumn(); ImGuiNative.igNextColumn();
} }
public static int GetColumnIndex() public static int GetColumnIndex()
{ {
return ImGuiNative.igGetColumnIndex(); return ImGuiNative.igGetColumnIndex();
@ -814,7 +813,6 @@ namespace ImGuiNET
return ImGuiNative.igGetColumnsCount(); return ImGuiNative.igGetColumnsCount();
} }
public static void OpenPopup(string id) public static void OpenPopup(string id)
{ {
ImGuiNative.igOpenPopup(id); ImGuiNative.igOpenPopup(id);
@ -860,7 +858,7 @@ namespace ImGuiNET
return ImGuiNative.igIsAnyItemActive(); return ImGuiNative.igIsAnyItemActive();
} }
public static void ShowTooltip(string text) public static void SetTooltip(string text)
{ {
ImGuiNative.igSetTooltip(text); ImGuiNative.igSetTooltip(text);
} }
@ -870,6 +868,11 @@ namespace ImGuiNET
ImGuiNative.igSetNextTreeNodeOpened(opened, SetCondition.Always); ImGuiNative.igSetNextTreeNodeOpened(opened, SetCondition.Always);
} }
public static void SetNextTreeNodeOpened(bool opened, SetCondition setCondition)
{
ImGuiNative.igSetNextTreeNodeOpened(opened, setCondition);
}
public static bool TreeNode(string label) public static bool TreeNode(string label)
{ {
return ImGuiNative.igTreeNode(label); return ImGuiNative.igTreeNode(label);

Loading…
Cancel
Save