Ver código fonte

Internals: stand-in for large branches to facilitate merging.

omar 5 anos atrás
pai
commit
4f33dd15c4
1 arquivos alterados com 38 adições e 2 exclusões
  1. 38 2
      imgui_internal.h

+ 38 - 2
imgui_internal.h

@@ -20,9 +20,13 @@ Index of this file:
 // [SECTION] Widgets support: flags, enums, data structures
 // [SECTION] Widgets support: flags, enums, data structures
 // [SECTION] Columns support
 // [SECTION] Columns support
 // [SECTION] Settings support
 // [SECTION] Settings support
+// [SECTION] Multi-select support
+// [SECTION] Docking support
+// [SECTION] Viewport support
 // [SECTION] ImGuiContext (main imgui context)
 // [SECTION] ImGuiContext (main imgui context)
 // [SECTION] ImGuiWindowTempData, ImGuiWindow
 // [SECTION] ImGuiWindowTempData, ImGuiWindow
-// [SECTION] Tab bar, Tab item
+// [SECTION] Tab bar, Tab item support
+// [SECTION] Table support
 // [SECTION] Internal API
 // [SECTION] Internal API
 // [SECTION] Test Engine Hooks (imgui_test_engine)
 // [SECTION] Test Engine Hooks (imgui_test_engine)
 
 
@@ -1030,6 +1034,30 @@ struct ImGuiColumns
     }
     }
 };
 };
 
 
+//-----------------------------------------------------------------------------
+// [SECTION] Multi-select support
+//-----------------------------------------------------------------------------
+
+#ifdef IMGUI_HAS_MULTI_SELECT
+// <this is filled in 'range_select' branch>
+#endif // #ifdef IMGUI_HAS_MULTI_SELECT
+
+//-----------------------------------------------------------------------------
+// [SECTION] Docking support
+//-----------------------------------------------------------------------------
+
+#ifdef IMGUI_HAS_DOCK
+// <this is filled in 'docking' branch>
+#endif // #ifdef IMGUI_HAS_DOCK
+
+//-----------------------------------------------------------------------------
+// [SECTION] Viewport support
+//-----------------------------------------------------------------------------
+
+#ifdef IMGUI_HAS_VIEWPORT
+// <this is filled in 'docking' branch>
+#endif // #ifdef IMGUI_HAS_VIEWPORT
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // [SECTION] Settings support
 // [SECTION] Settings support
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -1636,7 +1664,7 @@ struct ImGuiItemHoveredDataBackup
 };
 };
 
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-// [SECTION] Tab bar, Tab item
+// [SECTION] Tab bar, Tab item support
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 
 
 // Extend ImGuiTabBarFlags_
 // Extend ImGuiTabBarFlags_
@@ -1705,6 +1733,14 @@ struct ImGuiTabBar
     }
     }
 };
 };
 
 
+//-----------------------------------------------------------------------------
+// [SECTION] Table support
+//-----------------------------------------------------------------------------
+
+#ifdef IMGUI_HAS_TABLE
+// <this is filled in 'tables' branch>
+#endif // #ifdef IMGUI_HAS_TABLE
+
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // [SECTION] Internal API
 // [SECTION] Internal API
 // No guarantee of forward compatibility here!
 // No guarantee of forward compatibility here!