7d80a8f4f5
Backends: Fix ImGui_ImplSDL2_InitForMetal() in docking branch.
5 years ago
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
b62f1ea8e9
Fix zealous PVS studio warnings. Minor tweaks.
5 years ago
ceec3cd3fd
Backends: Win32: Added ImGui_ImplWin32_EnableDpiAwareness(), ImGui_ImplWin32_GetDpiScaleForHwnd(), ImGui_ImplWin32_GetDpiScaleForMonitor() helpers functions.
...
(backported from the docking branch)
5 years ago
8601187fee
Backends: Win32: Clarify how the WndProc handler requires a forward declaration.
5 years ago
ccaec1a270
Version 1.76 WIP
5 years ago
21b9e42964
Minor fixes to example_sdl_metal and a changelog entry.
...
Add example_sdl_metal to CI builds.
Closes #3017 .
5 years ago
f346b4b302
Examples: SDL+Metal example.
5 years ago
8432d1bfc7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
58b3e02b95
Version 1.75
...
Comments
5 years ago
7e2d172ae5
Backends: GLFW, SDL: Platform monitors declared properly even if multi-viewport is not enabled.
5 years ago
5be649e082
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
05a49f0413
Examples: Emscripten: Demonstrating embedding fonts in Makefile and code. ( #2953 ) [@Oipo]
5 years ago
e7bfcb970e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
5 years ago
0a23582718
Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.
5 years ago
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
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
4d4e3b97f4
TODO, Readme
...
(dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)
5 years ago
b887259974
Bindings: Improved FreeGLUT support for MinGW ( #3004 )
5 years ago
f6da5000bf
Backends: OpenGL2: Explicitly backup, setup and restore GL_TEXTURE_ENV to increase compatibility with legacy OpenGL applications. ( #3000 )
5 years ago
7a22767483
CI: Add MSVC extra warnings build and correct labels of other extra warnings builds.
5 years ago
f1b5c742ff
Viewports: Add various comments
5 years ago
3fe6ae9732
Internals: Move some Nav functions and members around (no functional change) + Misc comments
5 years ago
8bcac7d95c
Backends: GLFW, SDL: report Windows key (io.KeySuper) as always released.
...
Neither GLFW nor SDL can correctly report the key release in every cases (e.g. when using Win+V) causing problems with some widgets. The next release of GLFW (3.4+) will have a fix for it. However since it is both difficult and discouraged to make use of this key for Windows application anyway, we just hide it. (#2976 )
5 years ago
e499497ec5
Backends: Win32: Added support for io.KeySuper (Windows key) for consistency with other backends. ( #2976 )
...
Even if realistically it is difficult to make good use of under Windows.
+ Style editor: Use a more explicit form of RadioButton() to avoid being depending on underlying flags type. (#2983 )
5 years ago
aa34681652
Backends: GLFW: inhibit error callback when creating cursors because X11 setups may be missing them + comment ( #2980 )
5 years ago
44174b1fa1
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
5 years ago
4f7bf7e96a
Backends: Win32: Added support for #define IMGUI_IMPL_WIN32_DISABLE_GAMEPAD and IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT. ( #2716 )
5 years ago
ff5299e0e0
Docs: FAQ, Comments.
5 years ago
f03c00bc89
Added imgui_single_file.h, We use this to validate compiling all *.cpp in same compilation unit.
...
Removed Unity builds stuff from example_null/. CI builds a temporary .cpp file.
5 years ago
861f786d81
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
5 years ago
00c515f51a
Add glbinding build sample to Makefiles of GL3 examples. ( #2870 )
5 years ago
f6951bb67d
Viewports: SDL2: Honor NoTaskBarIcon flag under non Win32 OS. ( #2117 )
5 years ago
5e2329b98e
Backends: GL3: Implement glbinding opengl loader support. ( #2870 )
5 years ago
d581939387
Removed trailing spaces.
5 years ago
c706ff6f3a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
5 years ago
0f7105e156
Backends: SDL: Wayland: Use SDL_GetMouseState (amend 78ff147) ( #2800 , 2802)
5 years ago
78ff147181
SDL: On wayland use SDL_GetMouseState ( #2802 )
...
When the SDL Video backend is set to wayland the function
`SDL_GetGlobalMouseState` does not work. Most probably a security measure
for programs to not grab everything the user does
https://wiki.libsdl.org/SDL_GetGlobalMouseState
using SDL_GetMouseState https://wiki.libsdl.org/SDL_GetMouseState works
on wayland
5 years ago
992736dc5d
Merge branch 'refs/heads/master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
5 years ago
03b7170dac
Backends: GLFW: Added workaround for people who use development version of GLFW which is older than commit that added required cursor support. ( #2922 )
5 years ago
7ff13f4ee1
Examples: Explicitly adding -DIMGUI_IMPL_OPENGL_LOADER_GL3W to Makefile to match linking settings
...
(otherwise if another loader such as Glew is accessible, the opengl3 backend might automatically use it). [#2919 , #2798 ]
5 years ago
6d9a54a904
Examples: Metal: Wrap main event loop body in an @autoreleasepool block to ensure allocations get freed even if underlying system event loop gets paused due to app nap ( #2910 , #2917 )
5 years ago
8342e5b91a
Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4)
...
Amend b5cad20d79945a509773
5 years ago
945a509773
Implement ImGuiMouseCursor_NotAllowed mouse cursor.
5 years ago
b5cad20d79
Implement new GLFW 3.4 resizing cursors.
5 years ago
abaf0256b8
Version 1.75 WIP
...
Added message to font file loading assert.
5 years ago
28dd8d7efd
Docking: Fixed various conflicts not properly resolved on 813e0c1
...
New git client confusion.
5 years ago
bf6d1ba3d1
CI: Add 32/64 bit build variations to builds with extra warnings.
5 years ago
1742ca45c5
CI: Add unity builds test. ( #2893 )
5 years ago
813e0c18e6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
5 years ago
bdce833636
Version 1.74
5 years ago
26d177bc03
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
5 years ago
1615e9ea2a
CI: Enable extended warnings in example_null builds.
...
CI: Add MinGW build with extra warnings on windows.
(cherry picked from commit ebc98c273054d0f9b305a1346db98052616a8b21)
5 years ago
ca63349eb4
Renamed XX-bits -> XX-bit in comments to match what the world appears to be using.
5 years ago
4e90906b04
Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734 )
...
Using in Emscripten example.
5 years ago
69b5c2f541
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
3929255b77
Examples: Emscripten: Removed BINARYEN_TRAP_MODE=clamp from Makefile which was removed in Emscripten 1.39.0 but required prior to 1.39.0, making life easier for absolutely no-one. ( #2877 , #2878 ) [@podsvirov]
5 years ago
916487a653
example_emscripten: skip outdated compiler option
...
For more info see: https://github.com/ocornut/imgui/issues/2877
5 years ago
a704614b3e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
5 years ago
c9182424a8
Normalize all the line endings.
...
(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319)
5 years ago
b3e94f5de8
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
5 years ago
f002a11898
Backends: OpenGL3: Fix building with pre-3.2 GL bindings which do not expose glDrawElementsBaseVertex(), using runtime GL version to decide if we set ImGuiBackendFlags_RendererHasVtxOffset. ( #2866 , #2852 ) [@dpilawa]
5 years ago
4d0c88e9e6
Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. ( #2866 , #2852 )
5 years ago
0cbb96895a
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx12.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
5 years ago
75d540d336
Example: Emscripten: Fix for compilation (filesystem module is required) ( #2734 )
5 years ago
048b73dfaa
Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.
5 years ago
7b77cb3bb8
Backend: DX12: Fixed incorrect assert ( #2851 )
5 years ago
6ffee0e75e
Backends: DX12: Added extra ID3D12DescriptorHeap parameter to ImGui_ImplDX12_Init() function. The value is unused in master branch but will be used by the multi-viewport features (docking branch). ( #2851 )
...
+ Using SafeRelease() in master.
5 years ago
6faad0c34f
Backend: DX12: Amend 899e485. Fix memory leaks. Remove unused variable. ( #2851 )
...
(cherry picked from commit 39e2db6d94c295e7468c6a5fb39d247c641fb123)
5 years ago
05c1f2795a
Add multi-viewports for DX12. ( #2851 )
...
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
5 years ago
eedc8f993f
Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled.
5 years ago
7feccf9ab2
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
5 years ago
4de32cc87e
Backends: GLFW: Restore previously installed user callbacks in ImplGlfw when ImGui shuts down ( #2836 )
5 years ago
53278be61f
FAQ, Readme. Use = {} instead of = { 0 }, wasn't problematic because they were all static variables or one stack array not read. But hey.
5 years ago
3bbc27ebd9
Fixed more FAQ links. ( #2848 )
5 years ago
9d6b2b096b
Ignore directories created by JetBrains IDEs.
...
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
5 years ago
6892b81578
Remove trailing spaces from bunch of files.
...
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
5 years ago
fc10ba8d24
Amend f0238ece9cba67ecabef438008fea53682bd6bc7 ( #2817 , #2818 )
5 years ago
378035c6ff
Fixed backspace handling on MacOS (fixed https://github.com/ocornut/imgui/issues/2817 ).
...
Allow null view passing as parameter to ImGui_ImplOSX_NewFrame
5 years ago
bf4880f6a2
Merge branch 'master' into docking
5 years ago
323412dd23
Examples: Allegro5: updated build instructions for macOS
5 years ago
e0c0e53edf
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
a2f3dcfc97
Added comment about SDL and SDL_INIT_GAMECONTROLLER. ( #2809 )
5 years ago
c262276988
Version 1.74 WIP
5 years ago
f0f5301612
Backends: OpenGL3: Commented out extra tokens at end of #else directive ( #2804 )
5 years ago
6994bf10bc
Merge branch 'master' into docking + fix for RenderMouseCursor()
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
5 years ago
d5efe16157
Version 1.73
5 years ago
97691643b7
Backends: OpenGL3: Attempt to automatically detect default GL loader by using __has_include. Followup to 44cd8e3 ( #2798 )
5 years ago
44cd8e39da
Automatically include the available gl loader header
5 years ago
3233d85d2f
Merge branch 'master' into docking
5 years ago
f7468d05fe
Fixed mouse event forwarding in macos example ( #2710 , #1961 )
5 years ago
cf98290873
Backends: DirectX9: Workaround for windows not refreshing when main viewport has no draw call. ( #2560 )
5 years ago
575df6f192
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
5 years ago
e7e88ed413
Examples: SDL/GLFW + OpenGL3: Fixes for Makefile ( #2774 )
...
- append CXXFLAGS instead of overwriting them
- add glad.c build rule
5 years ago
cc288e073c
Backends: OpenGL3: Tweaked initialization code allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before ImGui_ImplOpenGL3_NewFrame() if for some reason they wanted.
5 years ago
a4af3cc814
Viewport, GLFW: Fix for #2756 under Windows.
5 years ago
a89a3cd2f1
Viewports, GLFW: Fix window having incorrect size after uncollapse. Issue manifests on Linux when window is in it's own viewport. ( #2756 , #2117 )
5 years ago
09780b8b3d
Viewport: Fix setting window size on macos (glfw). ( #2767 , #2117 )
...
MacOS positions windows by their bottom-left corner why the rest of the world (including imgui) position windows by the top-left corner. This created an issue where collapsing imgui window would cause window header to remain at the bottom the full window rect. Likewise resizing window by using sizing handle caused window to grow upwards when we tried to expand window downwards.
This workaround moves window to the opposite direction by the delta of size change creating an illusion that windows are positioned by their top-left corner.
5 years ago
e1fca8d982
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
a856c670c1
TabBar: fixed single-tab not shrinking their width down.
...
+ minor typo fixes (#2738 )
5 years ago
aedcd2fb1a
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
5 years ago
2e756d5b47
Explicit narrowing cast from size_t to UINT ( #2726 )
...
Clang: `non-constant-expression cannot be narrowed from type 'size_t' (aka 'unsigned long long') to 'UINT' (aka 'unsigned int') in initializer list [-Wc++11-narrowing]`
5 years ago
62143dff64
Backends: Vulkan: Added support for specifying multisample count. ( #2705 , #2706 )
6 years ago
6cf4743f17
Backends: DX11: Fixed GSGetShader() call not passing an initialized instance count, would generally make the debug layer complain (Added in 1.72).
6 years ago
f624455d7b
Version 1.73 WIP
6 years ago
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
6a0d0dab5a
Version 1.72b (patch for nav)
6 years ago
9183e7c426
Version 1.73 WIP
6 years ago
949a9fa2cb
Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. ( #2698 )
6 years ago
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
ecb9b1e2eb
Version 1.72
6 years ago
0e6a096afd
Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. ( #2109 )
...
Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.
6 years ago
9cda3035fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
cbd5a21fb0
Backends: DX10/DX11: Backup, clear and restore Geometry Shader is any is bound when calling renderer.
...
Backends: DX11: Clear Hull Shader, Domain Shader, Compute Shader before rendering. Not backing/restoring them.
6 years ago
29d9394a41
OSX: Disabled default native Mac clipboard copy/paste implementation in core library (added in 1.71), because it needs application to be linked with '-framework ApplicationServices'. It can be explicitly enabled back by using '#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS' in imconfig.h. Re-added equivalent using NSPasteboard api in the imgui_impl_osx.mm experimental back-end. ( #2546 )
6 years ago
f0348ddffc
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. ( #2677 , #2005 )
6 years ago
0f86116a69
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
6 years ago
adbbd17cb6
Addendum to #2635 . Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. ( #1542 )
6 years ago
3e8eebfbec
Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. ( #1542 , #2635 )
6 years ago
2cbc0f1287
Restore SLN which in Docking branch includes more projects.
6 years ago
e2c1f0a7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
516c3dee80
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. ( #2632 )
6 years ago
cc4d76cc23
Implement SDL/dx11 sample
6 years ago
342751c89e
Fiedx OpenGL ES 3.0 include for iOS and tvOS ( #2631 )
6 years ago
b27fd87177
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
6 years ago
5286ecb8a7
Version 1.72 WIP
6 years ago
d3d998a885
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
6 years ago
2da1c66d15
Version 1.71 + comments
6 years ago
4597632662
Readme, comments, dear imgui prefixes
6 years ago
63310acd58
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
6 years ago
431aa4e456
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
6 years ago
480d57e6a2
Revert "Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. ( #38 , #103 , #1172 , #1231 , #2489 )"
...
This reverts commit 597c024904
6 years ago
597c024904
Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. ( #38 , #103 , #1172 , #1231 , #2489 )
6 years ago
cc48f1e5dd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
6 years ago
c3d600abed
Fixed imgui_impl_opengl3 broken in previous few commits. ( #2591 , #2593 , #2594 )
6 years ago
ed79b4d22e
Examples/Backends: Metal: Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. ( #2591 , #2592 )
6 years ago
8dc04a4c9f
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.h
# imgui_demo.cpp
6 years ago
7755cbbef2
Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. ( #2591 ) + Fix OpenGL3 code missing flag.
6 years ago
c72040a715
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_osx.h
# examples/imgui_impl_osx.mm
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
6 years ago
b3dd03f582
Examples/Backends: DirectX9/10/11/12, Vulkan, OpenGL3 (Desktop GL only): Added support for large meshes (64k+ vertices) with 16-bits indices, enable 'ImGuiBackendFlags_HasVtxOffset' config flag in back-end. ( #2591 )
6 years ago
2742663ad2
Changelog, minor tweaks. ( #2585 )
6 years ago
c0e690318a
Examples: imgui_impl_osx: Added mouse cursor support. ( #2585 , #1873 )
6 years ago
affa7e2422
Examples: imgui_impl_opengl3: Fix empty printout on shader load. ( #2584 )
...
Fixed minor bug in CheckShader and CheckProgram
The log_length reported by
glGetProgramiv(handle, GL_INFO_LOG_LENGTH, &log_length)
will at least return 1, since the string delimiter is also counted.
The old version would always print and empty string to stderr. This is annoying in the emscripten port, since it prints a red error message to the Javascript console. The new version fixes this behavior.
6 years ago
04022114d9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
31e3e861ef
Update changelog, comments, made empty/no-text clipboard return NULL as with other implementation. Minor style tweaks. ( #2546 )
...
Fixed IMGUI_DISABLE_WIN32_FUNCTIONS not disabling IME code.
6 years ago
02de498a41
Add native mac copy/paste support to match win32 ( #2546 )
6 years ago
4158cba1ff
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
02d6d2d487
Platform Binding for GLFW updated with the release of GLFW 3.3 ( #2547 )
...
* With the release of GLFW 3.3, it is now possible to detect correctly monitors working area (see GLFW_HAS_MONITOR_WORK_AREA). GLFW 3.3 also introduced the window hint GLFW_FOCUS_ON_SHOW. This fixed the case where a new created window (viewport) takes the focus even if not visible.
* Disable a GLFW 3.2 windows hack when GLFW 3.3 is detected (related to window focused when shown).
6 years ago
ef13d95466
IO: changed AddInputCharacter(unsigned short c) signature to AddInputCharacter(unsigned int c).
...
Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode support. (#2538 , #2541 )
6 years ago
835a8b2c9b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
42fc563fed
Version 1.71 WIP + fixed minor typo
6 years ago
d1d5075b66
Version 1.70
6 years ago
e6c982509d
Examples: DirectX9: Fixes for multi-viewports. Avoid using a depth/stencil target for secondary viewport. ( #2520 , #2502 )
6 years ago
9ddb8493d5
Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. ( #2520 , #2502 )
6 years ago
76e61958fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
6 years ago
d88121ff5b
Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524
6 years ago
6c196cf432
Examples Readme and Changelog tweaks, added #2527 , re-ordered examples/README alphabetically.
6 years ago
5ecc9d5865
Examples: Metal: Add GLFW+Metal example
6 years ago
4f22a45cb5
Removed git merge leftovers
6 years ago
825b61e4ba
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
6 years ago
ae405b83a4
Examples: Added missing per-renderer local changelogs. ( #2037 , #1639 , #2452 )
6 years ago
7c6ba3a1da
ImDrawCallback_ResetRenderState: Added Metal.
6 years ago
5c1cd5c8c7
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. ( #2037 , #1639 , #2452 )
6 years ago
a649d904d7
Examples: Emscripten: Fixed not enabling Docking and Nav by default. ( #2494 )
6 years ago
dfb82d5c22
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
6 years ago
1ca6e5b59f
Examples: Glut: Added note about missing cursor support. ( #2375 , #2465 )
6 years ago
6789ea3482
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. ( #2509 , #2484 ).
6 years ago
994a92d79d
Added support to use controllers via SDL_GameController. ( #2509 )
...
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
6 years ago
f159eb35fb
Examples: SDL: Removed unused code. ( #2484 )
6 years ago
03b64defa5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
74a3878be4
emscripten: replace shell_minimal.html with 'soft fullscreen' version
6 years ago
1f25cdd6b4
Clarified asserts comments + todo entries. ( #2500 )
6 years ago
655ebe4eaf
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
6 years ago
8130fd9816
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). ( #2496 )
6 years ago
1fe6533192
Examples: Emscripten: Tweaks for size. ( #2494 )
6 years ago
b89202824e
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
35cbf9c052
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
6 years ago
eeea7da3d0
Examples: Emscripten: Fixed error in shell template. ( #2494 )
6 years ago
c1848b185c
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. ( #2494 )
6 years ago
882d480b5e
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
6 years ago
a936d0669c
Adding standalone Emscripten example.
6 years ago
328e4fa7e7
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
6 years ago
b8fe0df7df
Examples: Null: Added Makefile.
6 years ago
cf029b3e1c
Merge branch 'master' into docking
6 years ago
42423d5ea4
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. ( #297 )
6 years ago
1295205cd4
Examples: Vulkan: Fixed warnings. ( #2480 )
6 years ago
7056032483
Merge branch 'vulkan_fix_docking' into docking
6 years ago
50ceb25003
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
6 years ago
c43dab2414
Vulkan: Fix not incrementing semaphore index. ( #2472 , #2071 )
6 years ago
9c364b16ff
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
6 years ago
e099a7dc74
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
6 years ago
d61caf5714
Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. ( #2461 , #2348 , #2378 , #2097 )
6 years ago
e70f866ed2
Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames)
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
6 years ago
6bc47dfe48
Vulkan: Removed superfluous vkInstance parameters being passed along.
6 years ago
452047c7ca
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
6 years ago
ec76722d2d
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. ( #2472 , #2071 )
6 years ago
a45840746e
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
6 years ago
9acb158990
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
6 years ago
1ba79baab5
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. ( #2472 , #2461 , #2071 )
6 years ago
01de69de36
Vulkan: Note for unsupported feature with multi-viewports. ( #2071 )
6 years ago
8ec24036d7
Vulkan: Viewports: Removed redundant field.
6 years ago
29269d2aa8
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
6 years ago
0034e65c26
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
6 years ago
4f54a527ab
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. ( #2071 )
6 years ago
86f5945f49
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
6 years ago
66f4be2e13
Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. ( #2461 , #2348 , #2378 , #2097 , #2071 , #1677 )
6 years ago
6bf981c85c
Vulkan: More renaming. Comments.
6 years ago
f586764cdd
Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. ( #2071 )
6 years ago
54b8a65d9e
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. ( #2071 )
6 years ago
317859a3da
Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). ( #2071 )
6 years ago
c7eef99a33
Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. ( #2071 )
6 years ago
b88a3b2711
Examples: Vulkan: Added calls to supports runtime changing back buffer count. ( #2071 )
6 years ago
43a85dd02e
Merge branch 'master' into docking
6 years ago
1c3311e4d6
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
6 years ago
fc52364652
Tabs to Spaces, comments.
6 years ago
cdb109f617
Renamed freeglut vcxproj files + Comments, Changelog ( #2465 )
6 years ago
ece322ff12
freeglut -> glut rename
6 years ago
3fad375f5f
ifdef freeglut extensions properly
6 years ago
81f70e5b7c
Fixups for OSX
6 years ago
a402f5b9a9
Add makefile for freeglut
6 years ago
5c4cc370bb
Examples: Vulkan: Added shader sources/references in the .cpp source.
6 years ago
49fb8e6c45
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
6 years ago
da035ced97
InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. ( #1336 , #2467 )
...
+ Fix some output filename in SDL build batch files.
6 years ago
e3cd6b1cbb
Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
6 years ago
3a737e665a
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
6 years ago
e21bbee311
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. ( #2454 )
6 years ago
163779da51
Examples: DirectX12: Various tidying up.
6 years ago
512d39d031
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
6 years ago
a33d45d7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
20188b19d6
Comments ( #2441 ) + Freeglut fixes ( #2430 )
6 years ago
9350158d61
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
221bf93a55
Comments, todo list, remove trailing spaces.
6 years ago
ff03ae503b
Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. ( #2421 )
6 years ago
cf2c52282d
Version 1.70 WIP
6 years ago
b1af4d36ce
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
6 years ago
55c02099c5
Version 1.69, comments, typos
6 years ago
a26085ed53
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items ( #211 ) + Examples comments
6 years ago
9afb849e16
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
6 years ago
cfa8f672f6
Examples: GLFW, SDL: Preserve DisplayFramebufferScale when main viewport is minimized. (This is particularly useful for the viewport branch because we are not supporting per-viewport frame-buffer scale. It fixes windows not refreshing when main viewport is minimized.) ( #2416 )
6 years ago
f7db4fad31
Merge branch 'master' into docking
...
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
6 years ago
6767b0a1b0
Examples: Win32+DirectX: moved helper functions below main.
6 years ago
3eedb542a6
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
6 years ago
b5d57a6615
Fix typos. ( #2413 )
6 years ago
0a6c5bc234
Examples: DirectX9: Added support for multi-viewport ( #2394 )
6 years ago
e91d275b10
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
6 years ago
510342f024
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. ( #2394 )
6 years ago
49eb5f0280
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
6 years ago
beb3062dc5
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
6 years ago
9d1a392d7d
Examples: OpenGL: Comments about versions and loaders. ( #2393 , #2351 )
6 years ago
7a536f1bd2
Examples + Viewport: GLFW: context wasn't set when using multiple windows. ( #2392 )
6 years ago
ocornut
Rokas Kupstys
coding_jackalope
Konstantin Podsvirov
NeroBurner-tux
Max Thrun
dawid
Funto
Ilya.Sevrikov
malte-v
Egor Yusov
Harris Brakmic
osheriff
Rokas Kupstys
Matthias Moulin
Vilya Harvey
Chris Savoie
Aaron Cooper
Vincent Hamm
Vincent Hamm
actboy168
Mario Botsch
Andrew Willmott
Alzathar
ibachar
David Amador
Andre Weissflog
Nicolas "Pixel" Noble
MindSpunk
Andrew Willmott
Bruce Mitchener
Gilad Reich
Richard Mitton