mirror of
https://github.com/cimgui/cimgui.git
synced 2025-11-30 21:51:40 +00:00
Merge branch 'docking_inter'
This commit is contained in:
sonoro1234
@@ -700,28 +700,33 @@
|
||||
},
|
||||
{
|
||||
"calc_value": 54,
|
||||
"name": "ImGuiCol_NavCursor",
|
||||
"name": "ImGuiCol_UnsavedMarker",
|
||||
"value": "54"
|
||||
},
|
||||
{
|
||||
"calc_value": 55,
|
||||
"name": "ImGuiCol_NavWindowingHighlight",
|
||||
"name": "ImGuiCol_NavCursor",
|
||||
"value": "55"
|
||||
},
|
||||
{
|
||||
"calc_value": 56,
|
||||
"name": "ImGuiCol_NavWindowingDimBg",
|
||||
"name": "ImGuiCol_NavWindowingHighlight",
|
||||
"value": "56"
|
||||
},
|
||||
{
|
||||
"calc_value": 57,
|
||||
"name": "ImGuiCol_ModalWindowDimBg",
|
||||
"name": "ImGuiCol_NavWindowingDimBg",
|
||||
"value": "57"
|
||||
},
|
||||
{
|
||||
"calc_value": 58,
|
||||
"name": "ImGuiCol_COUNT",
|
||||
"name": "ImGuiCol_ModalWindowDimBg",
|
||||
"value": "58"
|
||||
},
|
||||
{
|
||||
"calc_value": 59,
|
||||
"name": "ImGuiCol_COUNT",
|
||||
"value": "59"
|
||||
}
|
||||
],
|
||||
"ImGuiColorEditFlags_": [
|
||||
@@ -4965,47 +4970,47 @@
|
||||
},
|
||||
"locations": {
|
||||
"ImBitVector": "imgui_internal:652",
|
||||
"ImColor": "imgui:2927",
|
||||
"ImDrawChannel": "imgui:3175",
|
||||
"ImDrawCmd": "imgui:3131",
|
||||
"ImDrawCmdHeader": "imgui:3167",
|
||||
"ImDrawData": "imgui:3396",
|
||||
"ImColor": "imgui:2928",
|
||||
"ImDrawChannel": "imgui:3176",
|
||||
"ImDrawCmd": "imgui:3132",
|
||||
"ImDrawCmdHeader": "imgui:3168",
|
||||
"ImDrawData": "imgui:3397",
|
||||
"ImDrawDataBuilder": "imgui_internal:880",
|
||||
"ImDrawFlags_": "imgui:3200",
|
||||
"ImDrawList": "imgui:3238",
|
||||
"ImDrawListFlags_": "imgui:3220",
|
||||
"ImDrawFlags_": "imgui:3201",
|
||||
"ImDrawList": "imgui:3239",
|
||||
"ImDrawListFlags_": "imgui:3221",
|
||||
"ImDrawListSharedData": "imgui_internal:853",
|
||||
"ImDrawListSplitter": "imgui:3183",
|
||||
"ImDrawListSplitter": "imgui:3184",
|
||||
"ImDrawTextFlags_": "imgui_internal:434",
|
||||
"ImDrawVert": "imgui:3152",
|
||||
"ImFont": "imgui:3815",
|
||||
"ImFontAtlas": "imgui:3618",
|
||||
"ImFontAtlasBuilder": "imgui_internal:3810",
|
||||
"ImFontAtlasFlags_": "imgui:3591",
|
||||
"ImFontAtlasPostProcessData": "imgui_internal:3783",
|
||||
"ImFontAtlasRect": "imgui:3581",
|
||||
"ImFontAtlasRectEntry": "imgui_internal:3775",
|
||||
"ImFontBaked": "imgui:3767",
|
||||
"ImFontConfig": "imgui:3503",
|
||||
"ImFontFlags_": "imgui:3802",
|
||||
"ImFontGlyph": "imgui:3543",
|
||||
"ImFontGlyphRangesBuilder": "imgui:3559",
|
||||
"ImFontLoader": "imgui_internal:3724",
|
||||
"ImDrawVert": "imgui:3153",
|
||||
"ImFont": "imgui:3818",
|
||||
"ImFontAtlas": "imgui:3621",
|
||||
"ImFontAtlasBuilder": "imgui_internal:3813",
|
||||
"ImFontAtlasFlags_": "imgui:3594",
|
||||
"ImFontAtlasPostProcessData": "imgui_internal:3786",
|
||||
"ImFontAtlasRect": "imgui:3584",
|
||||
"ImFontAtlasRectEntry": "imgui_internal:3778",
|
||||
"ImFontBaked": "imgui:3770",
|
||||
"ImFontConfig": "imgui:3506",
|
||||
"ImFontFlags_": "imgui:3805",
|
||||
"ImFontGlyph": "imgui:3546",
|
||||
"ImFontGlyphRangesBuilder": "imgui:3562",
|
||||
"ImFontLoader": "imgui_internal:3727",
|
||||
"ImFontStackData": "imgui_internal:888",
|
||||
"ImGuiActivateFlags_": "imgui_internal:1667",
|
||||
"ImGuiAxis": "imgui_internal:1138",
|
||||
"ImGuiBackendFlags_": "imgui:1710",
|
||||
"ImGuiBoxSelectState": "imgui_internal:1858",
|
||||
"ImGuiButtonFlagsPrivate_": "imgui_internal:1025",
|
||||
"ImGuiButtonFlags_": "imgui:1845",
|
||||
"ImGuiButtonFlags_": "imgui:1846",
|
||||
"ImGuiChildFlags_": "imgui:1197",
|
||||
"ImGuiCol_": "imgui:1721",
|
||||
"ImGuiColorEditFlags_": "imgui:1856",
|
||||
"ImGuiColorEditFlags_": "imgui:1857",
|
||||
"ImGuiColorMod": "imgui_internal:908",
|
||||
"ImGuiComboFlagsPrivate_": "imgui_internal:1052",
|
||||
"ImGuiComboFlags_": "imgui:1362",
|
||||
"ImGuiComboPreviewData": "imgui_internal:1152",
|
||||
"ImGuiCond_": "imgui:1970",
|
||||
"ImGuiCond_": "imgui:1971",
|
||||
"ImGuiConfigFlags_": "imgui:1690",
|
||||
"ImGuiContext": "imgui_internal:2163",
|
||||
"ImGuiContextHook": "imgui_internal:2148",
|
||||
@@ -5029,7 +5034,7 @@
|
||||
"ImGuiHoveredFlagsPrivate_": "imgui_internal:1008",
|
||||
"ImGuiHoveredFlags_": "imgui:1430",
|
||||
"ImGuiIDStackTool": "imgui_internal:2125",
|
||||
"ImGuiIO": "imgui:2369",
|
||||
"ImGuiIO": "imgui:2370",
|
||||
"ImGuiInputEvent": "imgui_internal:1528",
|
||||
"ImGuiInputEventAppFocused": "imgui_internal:1526",
|
||||
"ImGuiInputEventKey": "imgui_internal:1524",
|
||||
@@ -5041,7 +5046,7 @@
|
||||
"ImGuiInputFlagsPrivate_": "imgui_internal:1594",
|
||||
"ImGuiInputFlags_": "imgui:1667",
|
||||
"ImGuiInputSource": "imgui_internal:1510",
|
||||
"ImGuiInputTextCallbackData": "imgui:2611",
|
||||
"ImGuiInputTextCallbackData": "imgui:2612",
|
||||
"ImGuiInputTextDeactivatedState": "imgui_internal:1201",
|
||||
"ImGuiInputTextFlagsPrivate_": "imgui_internal:1016",
|
||||
"ImGuiInputTextFlags_": "imgui:1231",
|
||||
@@ -5050,26 +5055,26 @@
|
||||
"ImGuiItemFlags_": "imgui:1218",
|
||||
"ImGuiItemStatusFlags_": "imgui_internal:981",
|
||||
"ImGuiKey": "imgui:1538",
|
||||
"ImGuiKeyData": "imgui:2361",
|
||||
"ImGuiKeyData": "imgui:2362",
|
||||
"ImGuiKeyOwnerData": "imgui_internal:1581",
|
||||
"ImGuiKeyRoutingData": "imgui_internal:1555",
|
||||
"ImGuiKeyRoutingTable": "imgui_internal:1569",
|
||||
"ImGuiLastItemData": "imgui_internal:1360",
|
||||
"ImGuiLayoutType_": "imgui_internal:1119",
|
||||
"ImGuiListClipper": "imgui:2826",
|
||||
"ImGuiListClipper": "imgui:2827",
|
||||
"ImGuiListClipperData": "imgui_internal:1651",
|
||||
"ImGuiListClipperFlags_": "imgui:2800",
|
||||
"ImGuiListClipperFlags_": "imgui:2801",
|
||||
"ImGuiListClipperRange": "imgui_internal:1638",
|
||||
"ImGuiLocEntry": "imgui_internal:2029",
|
||||
"ImGuiLocKey": "imgui_internal:2014",
|
||||
"ImGuiLogFlags_": "imgui_internal:1126",
|
||||
"ImGuiMenuColumns": "imgui_internal:1183",
|
||||
"ImGuiMetricsConfig": "imgui_internal:2095",
|
||||
"ImGuiMouseButton_": "imgui:1928",
|
||||
"ImGuiMouseCursor_": "imgui:1938",
|
||||
"ImGuiMouseSource": "imgui:1959",
|
||||
"ImGuiMultiSelectFlags_": "imgui:2985",
|
||||
"ImGuiMultiSelectIO": "imgui:3012",
|
||||
"ImGuiMouseButton_": "imgui:1929",
|
||||
"ImGuiMouseCursor_": "imgui:1939",
|
||||
"ImGuiMouseSource": "imgui:1960",
|
||||
"ImGuiMultiSelectFlags_": "imgui:2986",
|
||||
"ImGuiMultiSelectIO": "imgui:3013",
|
||||
"ImGuiMultiSelectState": "imgui_internal:1915",
|
||||
"ImGuiMultiSelectTempData": "imgui_internal:1890",
|
||||
"ImGuiNavItemData": "imgui_internal:1738",
|
||||
@@ -5083,10 +5088,10 @@
|
||||
"ImGuiOldColumnData": "imgui_internal:1823",
|
||||
"ImGuiOldColumnFlags_": "imgui_internal:1803",
|
||||
"ImGuiOldColumns": "imgui_internal:1833",
|
||||
"ImGuiOnceUponAFrame": "imgui:2689",
|
||||
"ImGuiPayload": "imgui:2654",
|
||||
"ImGuiPlatformIO": "imgui:3926",
|
||||
"ImGuiPlatformImeData": "imgui:3976",
|
||||
"ImGuiOnceUponAFrame": "imgui:2690",
|
||||
"ImGuiPayload": "imgui:2655",
|
||||
"ImGuiPlatformIO": "imgui:3929",
|
||||
"ImGuiPlatformImeData": "imgui:3986",
|
||||
"ImGuiPlotType": "imgui_internal:1145",
|
||||
"ImGuiPopupData": "imgui_internal:1455",
|
||||
"ImGuiPopupFlags_": "imgui:1326",
|
||||
@@ -5095,49 +5100,49 @@
|
||||
"ImGuiScrollFlags_": "imgui_internal:1679",
|
||||
"ImGuiSelectableFlagsPrivate_": "imgui_internal:1065",
|
||||
"ImGuiSelectableFlags_": "imgui:1344",
|
||||
"ImGuiSelectionBasicStorage": "imgui:3058",
|
||||
"ImGuiSelectionExternalStorage": "imgui:3081",
|
||||
"ImGuiSelectionRequest": "imgui:3032",
|
||||
"ImGuiSelectionRequestType": "imgui:3024",
|
||||
"ImGuiSelectionBasicStorage": "imgui:3059",
|
||||
"ImGuiSelectionExternalStorage": "imgui:3082",
|
||||
"ImGuiSelectionRequest": "imgui:3033",
|
||||
"ImGuiSelectionRequestType": "imgui:3025",
|
||||
"ImGuiSeparatorFlags_": "imgui_internal:1087",
|
||||
"ImGuiSettingsHandler": "imgui_internal:1994",
|
||||
"ImGuiShrinkWidthItem": "imgui_internal:1418",
|
||||
"ImGuiSizeCallbackData": "imgui:2645",
|
||||
"ImGuiSizeCallbackData": "imgui:2646",
|
||||
"ImGuiSliderFlagsPrivate_": "imgui_internal:1058",
|
||||
"ImGuiSliderFlags_": "imgui:1912",
|
||||
"ImGuiSliderFlags_": "imgui:1913",
|
||||
"ImGuiSortDirection": "imgui:1525",
|
||||
"ImGuiStackLevelInfo": "imgui_internal:2113",
|
||||
"ImGuiStorage": "imgui:2762",
|
||||
"ImGuiStoragePair": "imgui:2745",
|
||||
"ImGuiStyle": "imgui:2257",
|
||||
"ImGuiStorage": "imgui:2763",
|
||||
"ImGuiStoragePair": "imgui:2746",
|
||||
"ImGuiStyle": "imgui:2258",
|
||||
"ImGuiStyleMod": "imgui_internal:915",
|
||||
"ImGuiStyleVarInfo": "imgui_internal:899",
|
||||
"ImGuiStyleVar_": "imgui:1799",
|
||||
"ImGuiTabBar": "imgui_internal:2775",
|
||||
"ImGuiTabBarFlagsPrivate_": "imgui_internal:2738",
|
||||
"ImGuiStyleVar_": "imgui:1800",
|
||||
"ImGuiTabBar": "imgui_internal:2776",
|
||||
"ImGuiTabBarFlagsPrivate_": "imgui_internal:2739",
|
||||
"ImGuiTabBarFlags_": "imgui:1377",
|
||||
"ImGuiTabItem": "imgui_internal:2756",
|
||||
"ImGuiTabItemFlagsPrivate_": "imgui_internal:2746",
|
||||
"ImGuiTabItem": "imgui_internal:2757",
|
||||
"ImGuiTabItemFlagsPrivate_": "imgui_internal:2747",
|
||||
"ImGuiTabItemFlags_": "imgui:1401",
|
||||
"ImGuiTable": "imgui_internal:2920",
|
||||
"ImGuiTableBgTarget_": "imgui:2111",
|
||||
"ImGuiTableCellData": "imgui_internal:2888",
|
||||
"ImGuiTableColumn": "imgui_internal:2828",
|
||||
"ImGuiTableColumnFlags_": "imgui:2058",
|
||||
"ImGuiTableColumnSettings": "imgui_internal:3068",
|
||||
"ImGuiTableColumnSortSpecs": "imgui:2133",
|
||||
"ImGuiTableFlags_": "imgui:2005",
|
||||
"ImGuiTableHeaderData": "imgui_internal:2897",
|
||||
"ImGuiTableInstanceData": "imgui_internal:2907",
|
||||
"ImGuiTableRowFlags_": "imgui:2096",
|
||||
"ImGuiTableSettings": "imgui_internal:3092",
|
||||
"ImGuiTableSortSpecs": "imgui:2123",
|
||||
"ImGuiTableTempData": "imgui_internal:3045",
|
||||
"ImGuiTextBuffer": "imgui:2724",
|
||||
"ImGuiTextFilter": "imgui:2697",
|
||||
"ImGuiTable": "imgui_internal:2921",
|
||||
"ImGuiTableBgTarget_": "imgui:2112",
|
||||
"ImGuiTableCellData": "imgui_internal:2889",
|
||||
"ImGuiTableColumn": "imgui_internal:2829",
|
||||
"ImGuiTableColumnFlags_": "imgui:2059",
|
||||
"ImGuiTableColumnSettings": "imgui_internal:3069",
|
||||
"ImGuiTableColumnSortSpecs": "imgui:2134",
|
||||
"ImGuiTableFlags_": "imgui:2006",
|
||||
"ImGuiTableHeaderData": "imgui_internal:2898",
|
||||
"ImGuiTableInstanceData": "imgui_internal:2908",
|
||||
"ImGuiTableRowFlags_": "imgui:2097",
|
||||
"ImGuiTableSettings": "imgui_internal:3093",
|
||||
"ImGuiTableSortSpecs": "imgui:2124",
|
||||
"ImGuiTableTempData": "imgui_internal:3046",
|
||||
"ImGuiTextBuffer": "imgui:2725",
|
||||
"ImGuiTextFilter": "imgui:2698",
|
||||
"ImGuiTextFlags_": "imgui_internal:1105",
|
||||
"ImGuiTextIndex": "imgui_internal:805",
|
||||
"ImGuiTextRange": "imgui:2707",
|
||||
"ImGuiTextRange": "imgui:2708",
|
||||
"ImGuiTooltipFlags_": "imgui_internal:1111",
|
||||
"ImGuiTreeNodeFlagsPrivate_": "imgui_internal:1078",
|
||||
"ImGuiTreeNodeFlags_": "imgui:1282",
|
||||
@@ -5145,27 +5150,27 @@
|
||||
"ImGuiTypingSelectFlags_": "imgui_internal:1766",
|
||||
"ImGuiTypingSelectRequest": "imgui_internal:1774",
|
||||
"ImGuiTypingSelectState": "imgui_internal:1785",
|
||||
"ImGuiViewport": "imgui:3900",
|
||||
"ImGuiViewportFlags_": "imgui:3885",
|
||||
"ImGuiViewport": "imgui:3903",
|
||||
"ImGuiViewportFlags_": "imgui:3888",
|
||||
"ImGuiViewportP": "imgui_internal:1943",
|
||||
"ImGuiWindow": "imgui_internal:2603",
|
||||
"ImGuiWindow": "imgui_internal:2604",
|
||||
"ImGuiWindowFlags_": "imgui:1148",
|
||||
"ImGuiWindowRefreshFlags_": "imgui_internal:1276",
|
||||
"ImGuiWindowSettings": "imgui_internal:1980",
|
||||
"ImGuiWindowStackData": "imgui_internal:1409",
|
||||
"ImGuiWindowTempData": "imgui_internal:2550",
|
||||
"ImGuiWindowTempData": "imgui_internal:2551",
|
||||
"ImRect": "imgui_internal:573",
|
||||
"ImTextureData": "imgui:3461",
|
||||
"ImTextureFormat": "imgui:3429",
|
||||
"ImTextureRect": "imgui:3448",
|
||||
"ImTextureData": "imgui:3462",
|
||||
"ImTextureFormat": "imgui:3430",
|
||||
"ImTextureRect": "imgui:3449",
|
||||
"ImTextureRef": "imgui:361",
|
||||
"ImTextureStatus": "imgui:3436",
|
||||
"ImTextureStatus": "imgui:3437",
|
||||
"ImVec1": "imgui_internal:547",
|
||||
"ImVec2": "imgui:291",
|
||||
"ImVec2i": "imgui_internal:555",
|
||||
"ImVec2ih": "imgui_internal:563",
|
||||
"ImVec4": "imgui:304",
|
||||
"stbrp_context_opaque": "imgui_internal:3807"
|
||||
"stbrp_context_opaque": "imgui_internal:3810"
|
||||
},
|
||||
"nonPOD": {
|
||||
"ImBitArray": true,
|
||||
@@ -7052,6 +7057,10 @@
|
||||
"name": "DragDropTargetId",
|
||||
"type": "ImGuiID"
|
||||
},
|
||||
{
|
||||
"name": "DragDropTargetFullViewport",
|
||||
"type": "ImGuiID"
|
||||
},
|
||||
{
|
||||
"name": "DragDropAcceptFlags",
|
||||
"type": "ImGuiDragDropFlags"
|
||||
@@ -8544,11 +8553,11 @@
|
||||
},
|
||||
{
|
||||
"name": "RoutingCurrScore",
|
||||
"type": "ImU8"
|
||||
"type": "ImU16"
|
||||
},
|
||||
{
|
||||
"name": "RoutingNextScore",
|
||||
"type": "ImU8"
|
||||
"type": "ImU16"
|
||||
},
|
||||
{
|
||||
"name": "RoutingCurr",
|
||||
@@ -9734,7 +9743,7 @@
|
||||
},
|
||||
{
|
||||
"name": "Colors[ImGuiCol_COUNT]",
|
||||
"size": 58,
|
||||
"size": 59,
|
||||
"type": "ImVec4"
|
||||
},
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user