pull imgui 1.68

This commit is contained in:
sonoro1234
2019-02-19 13:11:06 +01:00
parent 806ff124a1
commit 666a687e0f
11 changed files with 404 additions and 287 deletions

View File

@@ -1326,8 +1326,13 @@
},
{
"calc_value": 22,
"name": "ImGuiStyleVar_COUNT",
"name": "ImGuiStyleVar_SelectableTextAlign",
"value": 22
},
{
"calc_value": 23,
"name": "ImGuiStyleVar_COUNT",
"value": 23
}
],
"ImGuiTabBarFlags_": [
@@ -1348,12 +1353,12 @@
},
{
"calc_value": 4,
"name": "ImGuiTabBarFlags_NoCloseWithMiddleMouseButton",
"name": "ImGuiTabBarFlags_TabListPopupButton",
"value": "1 << 2"
},
{
"calc_value": 8,
"name": "ImGuiTabBarFlags_NoTabListPopupButton",
"name": "ImGuiTabBarFlags_NoCloseWithMiddleMouseButton",
"value": "1 << 3"
},
{
@@ -1742,6 +1747,10 @@
{
"name": "DisplaySize",
"type": "ImVec2"
},
{
"name": "FramebufferScale",
"type": "ImVec2"
}
],
"ImDrawList": [
@@ -1828,56 +1837,56 @@
}
],
"ImFont": [
{
"name": "FontSize",
"type": "float"
},
{
"name": "Scale",
"type": "float"
},
{
"name": "DisplayOffset",
"type": "ImVec2"
},
{
"name": "Glyphs",
"template_type": "ImFontGlyph",
"type": "ImVector_ImFontGlyph"
},
{
"name": "IndexAdvanceX",
"template_type": "float",
"type": "ImVector_float"
},
{
"name": "FallbackAdvanceX",
"type": "float"
},
{
"name": "FontSize",
"type": "float"
},
{
"name": "IndexLookup",
"template_type": "ImWchar",
"type": "ImVector_ImWchar"
},
{
"name": "Glyphs",
"template_type": "ImFontGlyph",
"type": "ImVector_ImFontGlyph"
},
{
"name": "FallbackGlyph",
"type": "const ImFontGlyph*"
},
{
"name": "FallbackAdvanceX",
"type": "float"
"name": "DisplayOffset",
"type": "ImVec2"
},
{
"name": "FallbackChar",
"type": "ImWchar"
"name": "ContainerAtlas",
"type": "ImFontAtlas*"
},
{
"name": "ConfigData",
"type": "const ImFontConfig*"
},
{
"name": "ConfigDataCount",
"type": "short"
},
{
"name": "ConfigData",
"type": "ImFontConfig*"
"name": "FallbackChar",
"type": "ImWchar"
},
{
"name": "ContainerAtlas",
"type": "ImFontAtlas*"
"name": "Scale",
"type": "float"
},
{
"name": "Ascent",
@@ -1887,13 +1896,13 @@
"name": "Descent",
"type": "float"
},
{
"name": "DirtyLookupTables",
"type": "bool"
},
{
"name": "MetricsTotalSurface",
"type": "int"
},
{
"name": "DirtyLookupTables",
"type": "bool"
}
],
"ImFontAtlas": [
@@ -2164,14 +2173,6 @@
"name": "DisplayFramebufferScale",
"type": "ImVec2"
},
{
"name": "DisplayVisibleMin",
"type": "ImVec2"
},
{
"name": "DisplayVisibleMax",
"type": "ImVec2"
},
{
"name": "MouseDrawCursor",
"type": "bool"
@@ -2658,6 +2659,10 @@
"name": "ButtonTextAlign",
"type": "ImVec2"
},
{
"name": "SelectableTextAlign",
"type": "ImVec2"
},
{
"name": "DisplayWindowPadding",
"type": "ImVec2"