59 Commits (376c88a864f8933463003a08f94574e17bd9eef3)

Author	SHA1	Message	Date
omar	a82be53407	Merge branch 'docking2' into viewport_docking ... # Conflicts: # examples/example_glfw_opengl2/main.cpp # examples/example_glfw_opengl3/main.cpp # examples/example_glfw_vulkan/main.cpp # examples/example_sdl_opengl3/main.cpp # examples/example_sdl_vulkan/main.cpp # examples/example_win32_directx10/main.cpp # examples/example_win32_directx11/main.cpp # examples/example_win32_directx12/main.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h	7 years ago
omar	49533bc86e	Examples: Enabled Docking + Nav by default in the branch. (#351)	7 years ago
omar	5d630c930d	Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542)	7 years ago
omar	352695bc57	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp # imgui.cpp	7 years ago
omar	ff83d0e369	Examples: Using fully qualified "Dear ImGui" name in window titles.	7 years ago
omar	ee98a069f0	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_dx10.cpp # examples/imgui_impl_dx11.cpp # imgui_demo.cpp	7 years ago
omar	73e13a0762	Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.	7 years ago
omar	9660657e95	Merge branch 'master' into viewport ... # Conflicts: # examples/imgui_impl_sdl.cpp	7 years ago
omar	8d58fbb5ed	Examples: Renamed example folders. (#1870)	7 years ago