1465 Commits (docking)

Author SHA1 Message Date
Rokas Kupstys a3f79104df Examples: Apple+Metal: Forward events to OS key combinations like CMD+Q can work. (#3554) 4 years ago
ocornut ac08593b96 Merge branch 'master' into docking + tweak dock node padding + use CheckboxFlags with int
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
4 years ago
ocornut 5f97809cab Misc tidying up (zero-clear structures, more unused default in ClipRetFullscreen, NavApplyItemToResult() coding style fix)
Zero-clearing more structures
Remove arbitrary default ClipRetFullscreen value in ImDrawListSharedData.
Nav extracted NavApplyItemToResult() function.
Coding style fixes in OSX Backends.
4 years ago
ocornut e3ac52630a Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
4 years ago
Warren Moore bca4749346 Examples: Apple: Consolidated example_apple_metal to reduce class and file count (#1873, #3543) 4 years ago
Bill Six acb8ef2006
Examples: Vulkan: Fixed CMake include path. (#3550)
The backends directory was not included, so the build was failing.
4 years ago
ocornut 042a3b01d2 Merge branch 'master' into docking
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx10.h
#	backends/imgui_impl_vulkan.h
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/README.txt
#	examples/example_glfw_opengl2/main.cpp
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_directx11/main.cpp
#	examples/example_sdl_opengl2/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
#	examples/example_win32_directx9/main.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
4 years ago
ocornut b1a18d82e3 Moving backends code from examples/ to backends/ (step 6: update markdown documentation) 4 years ago
ocornut a2a3d80f04 Moving backends code from examples/ to backends/ (step 5: move documentation to MD files) 4 years ago
ocornut a2d845f9dd Moving backends code from examples/ to backends/ (step 4: update documentation, much improvement) 4 years ago
ocornut a7e21fb05f Moving backends code from examples/ to backends/ (step 3: fixing project files) 4 years ago
ocornut 428f4fce70 Moving backends code from examples/ to backends/ (step 2: moving vulkan cruft) 4 years ago
ocornut d9b2fb7338 Moving backends code from examples/ to backends/ (step 1: moving source files) 4 years ago
ocornut 124c2608f1 Docs: Renamed all occurences of "binding" and "back-end" to "backend" in comments and documentations, for consistency. 4 years ago
ocornut 0f13fdd177 Removed redirecting functions/enums names that were marked obsolete in 1.60: io.RenderDrawListsFn, IsAnyWindowFocused(), IsAnyWindowHovered(), etc. 4 years ago
ocornut 04de5ef819 Version 1.80 WIP 4 years ago
ocornut 682249396f Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
4 years ago
ocornut e5cb04b132 Version 1.79
+ Update readme and mission statement.
Removed "Minimize screen reel-estate usage", removed details on memory consumption (still very valid, just too much noise in a mission statement)
4 years ago
ocornut 7b1ab5b275 ImVector: Stricter bound-checking asserts. Fix warnings: trailing comma (old compilers), zealous preprocessor warnings. 4 years ago
ocornut 958e58b06b Merge branch 'master' into docking
# Conflicts:
#	examples/example_apple_opengl2/main.mm
#	imgui.cpp
4 years ago
ocornut 179dc04d8a Examples: Added missing comments in example_apple_metal. (#3400) 4 years ago
ocornut fa004ae79a Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_examples.sln
#	examples/imgui_impl_dx12.cpp
#	examples/imgui_impl_dx12.h
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
4 years ago
ocornut 825f699bde Backends: OpenGL3: Amends (#3467, #1985) 4 years ago
Sven Balzer 42575d4a99 Viewports, Backends: Win32: Fix toggling of ImGuiViewportFlags_TopMost (#3477) 4 years ago
Julian Webb 2460f2abe3 Backends: OpenGL3: Fix to avoid calling glBindSampler() with version <= 3.2 (#3467, #1985)
(nb: GLEW sets the define we previously used)
4 years ago
omar e230ec5a01 Viewports, Backends: DX12: Make secondary viewport format match main viewport one (#3462) {@BeastLe9enD] 4 years ago
Pierre-Loup Pagniez a1597cff08 Backends: DX12: Fix D3D12 Debug Layer warning if scissor rect is 0 width or 0 height. (#3472, #3462)
In the event where the scissor rect is 0 width or 0 height, don't call Draw, as it generates warnings if the D3D12 Debug Layer is enabled, and nothing would have been drawn anyway.
4 years ago
omar a8f409a848 Examples: DX12: Enable breaking on any warning/error when debug interface is enabled. (#3462, #3472) + misc comments & minor fixes. 4 years ago
omar 770c995365 Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2. (#3459) + Add ImGui_ImplVulkanH_CreateWindowSwapChain in ImGui_ImplVulkanH_CreateOrResizeWindow(). 4 years ago
omar e8447dea45 Backends: Vulkan: Removed unused shader code. Fix leaks. Avoid unnecessary pipeline creation for main viewport. Amend 41e2aa2. (#3459) 4 years ago
omar d8d58b038e Backends, Examples: DX12: Clarify support for 32-bit building in project files and comments. (#301) 4 years ago
omar 78f753ffff Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code (#3455, #3459) 4 years ago
Michel Lesoinne 41e2aa2e7a Backends: Vulkan: Separate the pipeline of the dear imgui created windows from the one created with the user's render-pass. (#3455, #3459)
This is mostly for the benefit of multi-viewports.
4 years ago
omar 6461fd40ab Examples: Fixed SDL+OpenGL2 and SDL+Vulkan examples not processing SDL_WINDOWEVENT_CLOSE events which tends to be needed in multi-viewport setting. 4 years ago
Michel Lesoinne b25756be4a Examples: Vulkan: Switch validation layer. Fix CMakeLists to find Vulkan the standard way. (#3459) 4 years ago
Doug Binks aa8e09d7f1 Backends: GLFW: workaround for cases where glfwGetMonitorWorkarea fails (#3457) 4 years ago
ocornut 36c331ff74 Merge branch 'master' into docking
# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
#	imgui_internal.h
4 years ago
ocornut b73305be11 Examples: Vulkan: Reworked buffer resize handling, amend df89a16d (#3390, #2626) 4 years ago
ocornut e9053515bb Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
4 years ago
ocornut df89a16d26 Examples: Vulkan: Reworked buffer resize handling, fix for Linux/X11. (#3390, #2626) 4 years ago
ocornut d6f3a8848d Viewports: Backends: DirectX9: Allow D3DERR_DEVICELOST on secondary viewports. (#3424) 4 years ago
ocornut ad8fdc917f Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
4 years ago
ocornut 9262609eaf Version 1.79 WIP 4 years ago
ocornut 024993adf9 Revert leftovers from 4c201994d4 4 years ago
ocornut 4c201994d4 DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. (#3361) 4 years ago
ocornut 05bc204dbd Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.h
4 years ago
ocornut 95c99aaa4b Version 1.78 4 years ago
omar 14539b3ed2
Update Emscripten readme about emrun (#3412) 4 years ago
omar d3fcc37e9e
Update Emscripten readme about local XHR requests (#3412) 4 years ago
ocornut 25a9209b75 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp
4 years ago
omar 009276b6cb Backends: Allegro 5: Fixed horizontal scrolling direction with mouse wheel / touch pads (#3394, #2424, #1463) [@nobody-special666]
Amend 7dea158175
+ Fix vsproj GUID
4 years ago
omar 2c13a74a9d Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
4 years ago
omar 209a6a751c Revert "Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain)"
This reverts commit a24578ec09.
/ZI not supported on 64-bit on some toolchains, leaving to default is best?
4 years ago
ocornut ede8825fb2 Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833 (#3390) 4 years ago
omar a24578ec09 Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain) 4 years ago
omar 963839373c Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call). 4 years ago
Rokas Kupstys 3d4af15d1d Backends GLFW: Use GLFW_MOUSE_PASSTHROUGH when available. 4 years ago
omar cba52b66af Backends: GLFW: Fixed enabling ImGuiBackendFlags_HasMouseHoveredViewport broken by 950539b7.
As it turns out, back-end passing NULL hovered with HasMouseHoveredViewport is also broken which defeats some of its purpose.
4 years ago
omar f79f0e42f7 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
4 years ago
omar fb7f6cab8c Backends: Amend, docs + extra comments. (#3330, #3245) 4 years ago
Moritz Heinemann 06f7854b16 Backends: OpenGL3: Add glad 2 to OpenGL loaders. (#3330) 4 years ago
omar b626dd57d3 Backends: DX12, Viewports: Tidying up, renaming. 4 years ago
omar cb1d578470 Backends: DX12, Viewports: Fixed issue on shutdown when viewports are disabled. (#3347) 4 years ago
omar ab4ef822f0 Version 1.78 WIP 4 years ago
omar 90ea7e2f2f Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
4 years ago
Rokas Kupstys 0738611559 Misc: Bunch of code formatting changes suggested by a pass running 'astyle' 4 years ago
omar ddabfc3477 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
4 years ago
omar 9418dcb693 Version 1.77
+ fix minor clang-tidy warnings which seems reasonable
4 years ago
omar 20d61f5f62 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
4 years ago
omar 99f68d7958 Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks. 4 years ago
ocornut 2665288b30 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
4 years ago
ocornut 40b799023b Docs: Update fonts.md (#2861) + update all references to FONTS.txt 4 years ago
ocornut 8baa4ccff5 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
4 years ago
Rokas Kupstys 5af8a8c7e8 CI: Extra warnings for builds with Clang. Backends: OpenGL3: Fix sign conversion warnings. 4 years ago
Rokas Kupstys dc49b14e29 Misc: Fix examples of using other OpenGL3 bindings in Makefiles. 4 years ago
Mark Jansen 6eb66fbef3
Backends: Win32: Cache the result of a windows version check. (#3283)
This is not expected to change while the application is running :)
4 years ago
Giovanni Funchal 3f26a07ee1 Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. (#3246) 4 years ago
ocornut 5d472c4895 Merge branch 'master' into docking + fixes for #3259
# Conflicts:
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
4 years ago
ocornut a06eb83359 Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259) 4 years ago
ocornut bb2529dd48 Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends. 4 years ago
ocornut a056603d8b Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow 4 years ago
ocornut 9c209d5a90 Minor amend 9028088 (#3261) 4 years ago
Nicolas Burrus 43f79aa210 Backends: OSX: import the glfw workaround to avoid missing mouse clicks. (#3261) 4 years ago
Nicolas Burrus 39d17ca07f Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. (#3260) 4 years ago
Espyo f44962c01a
Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. (#3252) 4 years ago
omar 75bbbda645 Examples: Update comments to get SDL2 package with msys2's pacman (#3251) 4 years ago
omar e4d8267188 Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
4 years ago
Chris Savoie 03ea87ea28 Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings. 4 years ago
Albert Vaca 685ca27d84 Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. (#3199) 4 years ago
Ivan Zinkevich 1e7672acf4 Backends: DX12: Fixed OBJECT_DELETED_WHILE_STILL_IN_USE on viewport resizing. (#3210)
Tested with detaching/attaching a viewport and resizing it. DX12 debug
layer is clean.
4 years ago
omar 582f4db59b Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
4 years ago
omar 11a3e75f47 Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). (#3183) 4 years ago
omar 5116eee108 Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
4 years ago
omar 099091280f Backends: DX10/DX11: Minor tweaks. 4 years ago
Silent 1e9abf60d1 Backends: Keep shader blobs as local variables. (#3176) 4 years ago
omar d5ce3b43ae Backends: Vulkan: Fixed error in if initial frame has no vertices. (#3177) 4 years ago
Chris Savoie 73c30aa085 Backends: Vulkan: Don't skip drawing when there's no vertexes to ensure that user callbacks are still processed. 5 years ago
Matt Haynie d3212482fe
Fix multiple macro definitions of GLFW_INCLUDE_NONE (#3157) 5 years ago
u3shit 528b12eb7a Fix glClipControl(GL_UPPER_LEFT) handling in opengl3. 5 years ago
ocornut 266dff9bed Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
5 years ago
omar 37f665b619 Backends: Win32: Support for #define NOGDI, won't try to call GetDeviceCaps(). (#3137, #2327) 5 years ago
Rokas Kupstys 7f8b076f2b Viewports, Backends: GLFW: Fix windows resizing incorrectly due to GLFW firing window positioning callbacks on next frame after window is resized manually. (#2117)
+ Docking fixed PVS warning
5 years ago
omar e8c986b34e Version 1.77 WIP 5 years ago
SergeyN 013013737f Viewports, Backends: DX12: Fix for crash caused by early resource release. (#3121) 5 years ago
omar b8e2b2bd6b Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
5 years ago
omar 5503c0a12e Version 1.76
+ fixed PVS warning, update demo binaries, update readme image
5 years ago
omar ec7294d890 Backends: OpenGL3: Fixed version check mistakenly testing for GL 4.0+ instead of 3.2+ to enable ImGuiBackendFlags_RendererHasVtxOffset, leaving 3.2 contexts without it. (#3119, #2866, #2852) 5 years ago
SergeyN 977ac53dd8 Examples: Win32+DX12: Fixed resizing main window, enabled debug layer. (#3087, #3115) 5 years ago
Rokas Kupstys c142540705 Viewports, Backends: GLFW: Avoid using window positioning workaround for glfw versions that have it fixed. Amend 09780b8. 5 years ago
omar e9366b4c73 Regretfully moved .gitignore file from examples/ into root directory because OSX keeps pooping its DS_Store/ artifacts everywhere. (#3088) 5 years ago
omar cc0e43e631 Backends: Comments next to include, misc minor comments/tweaks, fix imgui_impl_osx.h using IMGUI_API instead of IMGUI_IMPL_API. (#3105) 5 years ago
OmarEmaraDev 00927105ba Backends: Include imgui.h in implementation headers. (#3105)
Currently, the implementation headers don't include the imgui.h header.
Which means that the compilation will fail if the implementation header
was included before the imgui.h header in the compilation unit. For
instance, a compilation unit with the following will work:

  #include "imgui.h"
  #include "imgui_impl_glfw.h"
  #include "imgui_impl_opengl3.h"

But a compilation unit with the following will fail because IMGUI_IMPL_API
and possibly other symbols will not be defined:

  #include "imgui_impl_glfw.h"
  #include "imgui_impl_opengl3.h"
  #include "imgui.h"

This patch includes imgui.h in the implementation headers to make
inclusions order-invariant, which is a recommended practice.
5 years ago
omar 3930472f34 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
5 years ago
omar cc0d4e346a Misc: Added an explicit compile-time test for non-scoped IM_ASSERT() macros to redirect users to a solution + fixed our stb wrappers.
+ Nav: Use nav layer enum, comments.
5 years ago
omar 0e884304ee Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
5 years ago
omar f2b01c3436 Changelog, tweak OpenGL3 backends. (#3061), update Gallery thread links. 5 years ago
David Kalnischkies ac4262ad01 Backends: OpenGL3: Support older 2.x series of glbinding as loader for OpenGL3 (#3061)
This removes the unversioned definition IMGUI_IMPL_OPENGL_LOADER_GLBINDING in favor of two versioned ones to choose explicitly.
References: #2870, 5e2329b98e
5 years ago
omar 16a9488c13 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
5 years ago
omar d8824f9a9a CI: Clarify purpose of example_null, Changelog 5 years ago
Rokas Kupstys ac5ffffc23 CI: Test builds with freetype on linux. 5 years ago
ocornut ea0399414c Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
5 years ago
ocornut 1abb02fb67 Viewports: Fix for UWP on IME code moved back-end side (#2895, #2892) + Docking: Comments. 5 years ago
ocornut b016f1ad70 Examples: SDL+DX11: Fixed resizing main window. Amend (#3057) 5 years ago
joeslay a0f01d2290 Improve resizing in dx11 example (#3057)
Make the dx11 example implementation resize the window in a sane way, i.e. not the stretching/scaling the initial render to fit the new window size (current behaviour).
5 years ago
ocornut aef057e975 Internals: Added GetInputTextState() + comments. 5 years ago
ocornut fbaf65b8f6 Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)"
This reverts commit f2c7f3b200.
5 years ago
ocornut f2c7f3b200 Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542) 5 years ago
ocornut a7ace918fe Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_win32.cpp
#	imgui.cpp
5 years ago
ocornut a41332453e Unicode: Changelog, comments, minimum CI integration. (#2541, #2538, #2815) 5 years ago
Cloud Wu 6d59653e82 Unicode: full Unicode Support (6 squashed commits) (#2541, #2538)
fix build for WideCharToMultiByte
[3181ff1e] Full Unicode Support
[6c9e73ac] Fix ImTextCountUtf8BytesFromChar and ImTextCharToUtf8, these APIs assume the input is an unicode code point, not UTF-16
[ba85665b] Add AddInputCharacterUTF16 for windows backend to handle WM_CHAR
[fafdcaf0] Use Windows API to convert UTF-16 for ImFileOpen
[dc7d5925] Use windows API to convert UTF-16 for clipboard
5 years ago
ocornut 05c3e0b898 Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
5 years ago
ocornut 0345324646 Backends: SDL: Fixed mapping for ImGuiKey_KeyPadEnter. (#3031) [@Davido71] 5 years ago
ocornut 7d80a8f4f5 Backends: Fix ImGui_ImplSDL2_InitForMetal() in docking branch. 5 years ago
Omar bb1e6f8af6 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/example_win32_directx11/main.cpp
#	examples/example_win32_directx9/main.cpp
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
5 years ago
Omar b62f1ea8e9 Fix zealous PVS studio warnings. Minor tweaks. 5 years ago
Omar ceec3cd3fd Backends: Win32: Added ImGui_ImplWin32_EnableDpiAwareness(), ImGui_ImplWin32_GetDpiScaleForHwnd(), ImGui_ImplWin32_GetDpiScaleForMonitor() helpers functions.
(backported from the docking branch)
5 years ago
Omar 8601187fee Backends: Win32: Clarify how the WndProc handler requires a forward declaration. 5 years ago
omar ccaec1a270 Version 1.76 WIP 5 years ago
Rokas Kupstys 21b9e42964 Minor fixes to example_sdl_metal and a changelog entry.
Add example_sdl_metal to CI builds.

Closes #3017.
5 years ago
coding_jackalope f346b4b302 Examples: SDL+Metal example. 5 years ago
omar 8432d1bfc7 Merge branch 'master' into docking
# Conflicts:
#	docs/CHANGELOG.txt
5 years ago
omar 58b3e02b95 Version 1.75
Comments
5 years ago
omar 7e2d172ae5 Backends: GLFW, SDL: Platform monitors declared properly even if multi-viewport is not enabled. 5 years ago
omar 5be649e082 Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
5 years ago
omar 05a49f0413 Examples: Emscripten: Demonstrating embedding fonts in Makefile and code. (#2953) [@Oipo] 5 years ago
omar e7bfcb970e Merge branch 'master' into docking
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
#	imgui_internal.h
5 years ago
omar 0a23582718 Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32. 5 years ago
Rokas Kupstys 7794b104c5 Backends: SDL/Viewports: Fix crash when SDL backend is used with DirectX graphics API and system does not support Vulkan.
We must pass this flag only when we intend to render using vulkan backend.
5 years ago
omar f5528001f6 Merge branch 'master' into docking
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	imgui.cpp
#	imgui_internal.h
5 years ago
omar 4d4e3b97f4 TODO, Readme
(dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)
5 years ago