Skip to content

Commit 9874077

Browse files
ocornutocornut
committed
Merge branch 'tables'
2 parents f9b8736 + 0b14dd9 commit 9874077

File tree

48 files changed

+6515
-708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+6515
-708
lines changed

‎docs/CHANGELOG.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ HOW TO UPDATE?
3737

3838
Breaking Changes:
3939

40+
- Added imgui_tables.cpp file! Manually constructed project files will need the new file added!
4041
- Backends: moved all backends files (imgui_impl_XXXX.cpp, imgui_impl_XXXX.h) from examples/ to backends/. (#3513)
4142
- Removed redirecting functions/enums names that were marked obsolete in 1.60 (April 2017):
4243
- io.RenderDrawListsFn pointer -> use ImGui::GetDrawData() value and call the render function of your backend
@@ -58,6 +59,18 @@ Breaking Changes:
5859

5960
Other Changes:
6061

62+
- Tables: added new Tables Beta API as a replacement for old Columns. (#2957, #125)
63+
Check out 'Demo->Tables' for many demos + API comments in imgui.h for details.
64+
- Added 16 functions: BeginTable(), EndTable(),
65+
TableNextRow(), TableNextColumn(), TableSetColumnIndex(), TableGetColumnIndex(), TableGetRowIndex(),
66+
TableSetupColumn(), TableSetupScrollFreeze(),
67+
TableHeadersRow(), TableHeader(), TableSetBgColor(), TableGetSortSpecs(),
68+
TableGetColumnCount(), TableGetColumnName(), TableGetColumnFlags().
69+
- Added 2 structures: ImGuiTableSortSpecs, ImGuiTableColumnSortSpecs.
70+
- Added 2 enums: ImGuiSortDirection, ImGuiTableBgTarget.
71+
- Added 3 flags sets: ImGuiTableFlags (27 flags), ImGuiTableColumnFlags (24 flags), ImGuiTableRowFlags (1 flags).
72+
- Added 5 colors: ImGuiCol_TableHeaderBg, ImGuiCol_TableBorderStrong, ImGuiCol_TableBorderLight, ImGuiCol_TableRowBg, ImGuiCol_TableRowBgAlt.
73+
- Added 1 style var: ImGuiStyleVar_CellPadding.
6174
- Tab Bar: Made it possible to append to an existing tab bar by calling BeginTabBar()/EndTabBar() again.
6275
- Tab Bar: Fixed using more than 128 tabs in a tab bar (scrolling policy recommended).
6376
- Tab Bar: Do not display a tooltip if the name already fits over a given tab. (#3521)

‎examples/example_allegro5/example_allegro5.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_allegro5.cpp" />
163164
<ClCompile Include="imconfig_allegro5.h" />

‎examples/example_allegro5/example_allegro5.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<ClCompile Include="imconfig_allegro5.h">
2929
<Filter>sources</Filter>
3030
</ClCompile>
31+
<ClCompile Include="..\..\imgui_tables.cpp">
32+
<Filter>imgui</Filter>
33+
</ClCompile>
3134
<ClCompile Include="..\..\imgui_widgets.cpp">
3235
<Filter>imgui</Filter>
3336
</ClCompile>

‎examples/example_apple_metal/example_apple_metal.xcodeproj/project.pbxproj

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
07A82ED82139413D0078D120 /* imgui_widgets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07A82ED72139413C0078D120 /* imgui_widgets.cpp */; };
1111
07A82ED92139418F0078D120 /* imgui_widgets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07A82ED72139413C0078D120 /* imgui_widgets.cpp */; };
12+
5079822E257677DB0038A28D /* imgui_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5079822D257677DB0038A28D /* imgui_tables.cpp */; };
1213
8309BD8F253CCAAA0045E2A1 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8309BD8E253CCAAA0045E2A1 /* UIKit.framework */; };
1314
8309BDA5253CCC070045E2A1 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8309BDA0253CCBC10045E2A1 /* main.mm */; };
1415
8309BDA8253CCC080045E2A1 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8309BDA0253CCBC10045E2A1 /* main.mm */; };
@@ -33,6 +34,7 @@
3334
/* Begin PBXFileReference section */
3435
07A82ED62139413C0078D120 /* imgui_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imgui_internal.h; path = ../../imgui_internal.h; sourceTree = "<group>"; };
3536
07A82ED72139413C0078D120 /* imgui_widgets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imgui_widgets.cpp; path = ../../imgui_widgets.cpp; sourceTree = "<group>"; };
37+
5079822D257677DB0038A28D /* imgui_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imgui_tables.cpp; path = ../../imgui_tables.cpp; sourceTree = "<group>"; };
3638
8307E7C420E9F9C900473790 /* example_apple_metal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_apple_metal.app; sourceTree = BUILT_PRODUCTS_DIR; };
3739
8307E7DA20E9F9C900473790 /* example_apple_metal.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = example_apple_metal.app; sourceTree = BUILT_PRODUCTS_DIR; };
3840
8309BD8E253CCAAA0045E2A1 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -146,6 +148,7 @@
146148
83BBE9F020EB544400295997 /* imgui */ = {
147149
isa = PBXGroup;
148150
children = (
151+
5079822D257677DB0038A28D /* imgui_tables.cpp */,
149152
8309BDB5253CCC9D0045E2A1 /* imgui_impl_metal.mm */,
150153
8309BDB6253CCC9D0045E2A1 /* imgui_impl_osx.mm */,
151154
83BBEA0420EB54E700295997 /* imconfig.h */,
@@ -259,10 +262,11 @@
259262
buildActionMask = 2147483647;
260263
files = (
261264
8309BDBB253CCCAD0045E2A1 /* imgui_impl_metal.mm in Sources */,
262-
83BBEA0520EB54E700295997 /* imgui_draw.cpp in Sources */,
263265
83BBEA0920EB54E700295997 /* imgui.cpp in Sources */,
264266
83BBEA0720EB54E700295997 /* imgui_demo.cpp in Sources */,
265-
07A82ED82139413D0078D120 /* imgui_widgets.cpp in Sources */,
267+
83BBEA0520EB54E700295997 /* imgui_draw.cpp in Sources */,
268+
5079822E257677DB0038A28D /* imgui_tables.cpp in Sources */,
269+
07A82ED82139413D0078D120 /* imgui_widgets.cpp in Sources */,
266270
8309BDA5253CCC070045E2A1 /* main.mm in Sources */,
267271
);
268272
runOnlyForDeploymentPostprocessing = 0;
@@ -273,10 +277,11 @@
273277
files = (
274278
8309BDBE253CCCB60045E2A1 /* imgui_impl_metal.mm in Sources */,
275279
8309BDBF253CCCB60045E2A1 /* imgui_impl_osx.mm in Sources */,
276-
83BBEA0620EB54E700295997 /* imgui_draw.cpp in Sources */,
280+
83BBEA0A20EB54E700295997 /* imgui.cpp in Sources */,
281+
83BBEA0820EB54E700295997 /* imgui_demo.cpp in Sources */,
282+
83BBEA0620EB54E700295997 /* imgui_draw.cpp in Sources */,
283+
5079822E257677DB0038A28D /* imgui_tables.cpp in Sources */,
277284
07A82ED92139418F0078D120 /* imgui_widgets.cpp in Sources */,
278-
83BBEA0A20EB54E700295997 /* imgui.cpp in Sources */,
279-
83BBEA0820EB54E700295997 /* imgui_demo.cpp in Sources */,
280285
8309BDA8253CCC080045E2A1 /* main.mm in Sources */,
281286
);
282287
runOnlyForDeploymentPostprocessing = 0;

‎examples/example_apple_opengl2/example_apple_opengl2.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
4080A9B020B0347A0036BA46 /* imgui_impl_osx.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4080A99F20B034280036BA46 /* imgui_impl_osx.mm */; };
1717
4080A9B320B034E40036BA46 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4080A9B220B034E40036BA46 /* Cocoa.framework */; };
1818
4080A9B520B034EA0036BA46 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4080A9B420B034EA0036BA46 /* OpenGL.framework */; };
19+
50798230257677FD0038A28D /* imgui_tables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5079822F257677FC0038A28D /* imgui_tables.cpp */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXCopyFilesBuildPhase section */
@@ -46,6 +47,7 @@
4647
4080A9AC20B0343C0036BA46 /* imconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imconfig.h; path = ../../imconfig.h; sourceTree = "<group>"; };
4748
4080A9B220B034E40036BA46 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
4849
4080A9B420B034EA0036BA46 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
50+
5079822F257677FC0038A28D /* imgui_tables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imgui_tables.cpp; path = ../../imgui_tables.cpp; sourceTree = "<group>"; };
4951
/* End PBXFileReference section */
5052

5153
/* Begin PBXFrameworksBuildPhase section */
@@ -64,6 +66,7 @@
6466
4080A96220B029B00036BA46 = {
6567
isa = PBXGroup;
6668
children = (
69+
5079822F257677FC0038A28D /* imgui_tables.cpp */,
6770
4080A9AC20B0343C0036BA46 /* imconfig.h */,
6871
4080A9A720B0343C0036BA46 /* imgui.cpp */,
6972
4080A9A820B0343C0036BA46 /* imgui.h */,
@@ -161,6 +164,7 @@
161164
4080A9A220B034280036BA46 /* imgui_impl_opengl2.cpp in Sources */,
162165
4080A9B020B0347A0036BA46 /* imgui_impl_osx.mm in Sources */,
163166
4080A9AE20B0343C0036BA46 /* imgui.cpp in Sources */,
167+
50798230257677FD0038A28D /* imgui_tables.cpp in Sources */,
164168
07A82EDB213941D00078D120 /* imgui_widgets.cpp in Sources */,
165169
);
166170
runOnlyForDeploymentPostprocessing = 0;

‎examples/example_emscripten_opengl3/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ CXX = em++
1818
EXE = example_emscripten_opengl3.html
1919
IMGUI_DIR = ../..
2020
SOURCES = main.cpp
21-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
21+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
2222
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_sdl.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl3.cpp
2323
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2424
UNAME_S := $(shell uname -s)

‎examples/example_glfw_metal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
EXE = example_glfw_metal
1010
IMGUI_DIR = ../..
1111
SOURCES = main.mm
12-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
12+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
1313
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glfw.cpp $(IMGUI_DIR)/backends/imgui_impl_metal.mm
1414
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
1515

‎examples/example_glfw_opengl2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
EXE = example_glfw_opengl2
1818
IMGUI_DIR = ../..
1919
SOURCES = main.cpp
20-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
20+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
2121
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glfw.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl2.cpp
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)

‎examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_glfw.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_opengl2.cpp" />

‎examples/example_glfw_opengl2/example_glfw_opengl2.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<ClCompile Include="..\..\imgui_draw.cpp">
2323
<Filter>imgui</Filter>
2424
</ClCompile>
25+
<ClCompile Include="..\..\imgui_tables.cpp">
26+
<Filter>imgui</Filter>
27+
</ClCompile>
2528
<ClCompile Include="..\..\imgui_widgets.cpp">
2629
<Filter>imgui</Filter>
2730
</ClCompile>

‎examples/example_glfw_opengl3/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
EXE = example_glfw_opengl3
1818
IMGUI_DIR = ../..
1919
SOURCES = main.cpp
20-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
20+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
2121
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glfw.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl3.cpp
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)

‎examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_glfw.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_opengl3.cpp" />

‎examples/example_glfw_opengl3/example_glfw_opengl3.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<ClCompile Include="..\..\imgui_draw.cpp">
2929
<Filter>imgui</Filter>
3030
</ClCompile>
31+
<ClCompile Include="..\..\imgui_tables.cpp">
32+
<Filter>imgui</Filter>
33+
</ClCompile>
3134
<ClCompile Include="..\..\imgui_widgets.cpp">
3235
<Filter>imgui</Filter>
3336
</ClCompile>

‎examples/example_glfw_vulkan/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ include_directories(${GLFW_DIR}/deps)
3939

4040
file(GLOB sources *.cpp)
4141

42-
add_executable(example_glfw_vulkan ${sources} ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp ${IMGUI_DIR}/backends/imgui_impl_vulkan.cpp ${IMGUI_DIR}/imgui.cpp ${IMGUI_DIR}/imgui_draw.cpp ${IMGUI_DIR}/imgui_demo.cpp ${IMGUI_DIR}/imgui_widgets.cpp)
42+
add_executable(example_glfw_vulkan ${sources} ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp ${IMGUI_DIR}/backends/imgui_impl_vulkan.cpp ${IMGUI_DIR}/imgui.cpp ${IMGUI_DIR}/imgui_draw.cpp ${IMGUI_DIR}/imgui_demo.cpp ${IMGUI_DIR}/imgui_tables.cpp ${IMGUI_DIR}/imgui_widgets.cpp)
4343
target_link_libraries(example_glfw_vulkan ${LIBRARIES})

‎examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_glfw.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_vulkan.cpp" />

‎examples/example_glfw_vulkan/example_glfw_vulkan.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<ClCompile Include="..\..\imgui_draw.cpp">
2323
<Filter>imgui</Filter>
2424
</ClCompile>
25+
<ClCompile Include="..\..\imgui_tables.cpp">
26+
<Filter>imgui</Filter>
27+
</ClCompile>
2528
<ClCompile Include="..\..\imgui_widgets.cpp">
2629
<Filter>imgui</Filter>
2730
</ClCompile>

‎examples/example_glut_opengl2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
EXE = example_glut_opengl2
1313
IMGUI_DIR = ../..
1414
SOURCES = main.cpp
15-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
15+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
1616
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_glut.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl2.cpp
1717
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
1818
UNAME_S := $(shell uname -s)

‎examples/example_glut_opengl2/example_glut_opengl2.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_glut.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_opengl2.cpp" />

‎examples/example_glut_opengl2/example_glut_opengl2.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<ClCompile Include="..\..\imgui_draw.cpp">
2323
<Filter>imgui</Filter>
2424
</ClCompile>
25+
<ClCompile Include="..\..\imgui_tables.cpp">
26+
<Filter>imgui</Filter>
27+
</ClCompile>
2528
<ClCompile Include="..\..\imgui_widgets.cpp">
2629
<Filter>imgui</Filter>
2730
</ClCompile>

‎examples/example_marmalade/marmalade_example.mkb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ files
3333
../../imgui.cpp
3434
../../imgui_demo.cpp
3535
../../imgui_draw.cpp
36+
../../imgui_tables.cpp
3637
../../imgui_widgets.cpp
3738
../../imconfig.h
3839
../../imgui.h

‎examples/example_null/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ WITH_FREETYPE ?= 0
1313
EXE = example_null
1414
IMGUI_DIR = ../..
1515
SOURCES = main.cpp
16-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
16+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
1717
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
1818
UNAME_S := $(shell uname -s)
1919

‎examples/example_sdl_directx11/example_sdl_directx11.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@
159159
<ClCompile Include="..\..\imgui.cpp" />
160160
<ClCompile Include="..\..\imgui_demo.cpp" />
161161
<ClCompile Include="..\..\imgui_draw.cpp" />
162+
<ClCompile Include="..\..\imgui_tables.cpp" />
162163
<ClCompile Include="..\..\imgui_widgets.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_dx11.cpp" />
164165
<ClCompile Include="..\..\backends\imgui_impl_sdl.cpp" />

‎examples/example_sdl_directx11/example_sdl_directx11.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<ClCompile Include="..\..\imgui_draw.cpp">
3939
<Filter>imgui</Filter>
4040
</ClCompile>
41+
<ClCompile Include="..\..\imgui_tables.cpp">
42+
<Filter>imgui</Filter>
43+
</ClCompile>
4144
<ClCompile Include="..\..\imgui_widgets.cpp">
4245
<Filter>imgui</Filter>
4346
</ClCompile>

‎examples/example_sdl_metal/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
EXE = example_sdl_metal
1010
IMGUI_DIR = ../..
1111
SOURCES = main.mm
12-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
12+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
1313
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_sdl.cpp $(IMGUI_DIR)/backends/imgui_impl_metal.mm
1414
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
1515

‎examples/example_sdl_opengl2/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
EXE = example_sdl_opengl2
1818
IMGUI_DIR = ../..
1919
SOURCES = main.cpp
20-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
20+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
2121
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_sdl.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl2.cpp
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)

‎examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_opengl2.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_sdl.cpp" />

‎examples/example_sdl_opengl2/example_sdl_opengl2.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<ClCompile Include="main.cpp">
2323
<Filter>sources</Filter>
2424
</ClCompile>
25+
<ClCompile Include="..\..\imgui_tables.cpp">
26+
<Filter>imgui</Filter>
27+
</ClCompile>
2528
<ClCompile Include="..\..\imgui_widgets.cpp">
2629
<Filter>imgui</Filter>
2730
</ClCompile>

‎examples/example_sdl_opengl3/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
EXE = example_sdl_opengl3
1818
IMGUI_DIR = ../..
1919
SOURCES = main.cpp
20-
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_widgets.cpp
20+
SOURCES += $(IMGUI_DIR)/imgui.cpp $(IMGUI_DIR)/imgui_demo.cpp $(IMGUI_DIR)/imgui_draw.cpp $(IMGUI_DIR)/imgui_tables.cpp $(IMGUI_DIR)/imgui_widgets.cpp
2121
SOURCES += $(IMGUI_DIR)/backends/imgui_impl_sdl.cpp $(IMGUI_DIR)/backends/imgui_impl_opengl3.cpp
2222
OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
2323
UNAME_S := $(shell uname -s)

‎examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClCompile Include="..\..\imgui.cpp" />
159159
<ClCompile Include="..\..\imgui_demo.cpp" />
160160
<ClCompile Include="..\..\imgui_draw.cpp" />
161+
<ClCompile Include="..\..\imgui_tables.cpp" />
161162
<ClCompile Include="..\..\imgui_widgets.cpp" />
162163
<ClCompile Include="..\..\backends\imgui_impl_opengl3.cpp" />
163164
<ClCompile Include="..\..\backends\imgui_impl_sdl.cpp" />
@@ -180,4 +181,4 @@
180181
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
181182
<ImportGroup Label="ExtensionTargets">
182183
</ImportGroup>
183-
</Project>
184+
</Project>

‎examples/example_sdl_opengl3/example_sdl_opengl3.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<ClCompile Include="..\..\backends\imgui_impl_sdl.cpp">
3535
<Filter>sources</Filter>
3636
</ClCompile>
37+
<ClCompile Include="..\..\imgui_tables.cpp">
38+
<Filter>imgui</Filter>
39+
</ClCompile>
3740
<ClCompile Include="..\..\imgui_widgets.cpp">
3841
<Filter>imgui</Filter>
3942
</ClCompile>

0 commit comments

Comments
 (0)