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 )
5 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).
5 years ago
f624455d7b
Version 1.73 WIP
5 years ago
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
5 years ago
6a0d0dab5a
Version 1.72b (patch for nav)
5 years ago
9183e7c426
Version 1.73 WIP
5 years ago
949a9fa2cb
Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. ( #2698 )
5 years ago
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
ecb9b1e2eb
Version 1.72
5 years ago
0e6a096afd
Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. ( #2109 )
...
Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.
5 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
5 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.
5 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 )
5 years ago
f0348ddffc
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. ( #2677 , #2005 )
5 years ago
0f86116a69
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
5 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 )
5 years ago
3e8eebfbec
Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. ( #1542 , #2635 )
5 years ago
2cbc0f1287
Restore SLN which in Docking branch includes more projects.
5 years ago
e2c1f0a7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
516c3dee80
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. ( #2632 )
5 years ago
cc4d76cc23
Implement SDL/dx11 sample
5 years ago
342751c89e
Fiedx OpenGL ES 3.0 include for iOS and tvOS ( #2631 )
5 years ago
b27fd87177
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
5 years ago
5286ecb8a7
Version 1.72 WIP
5 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
5 years ago
2da1c66d15
Version 1.71 + comments
5 years ago
4597632662
Readme, comments, dear imgui prefixes
5 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.
5 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.
5 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
5 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 )
5 years ago
cc48f1e5dd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
5 years ago
c3d600abed
Fixed imgui_impl_opengl3 broken in previous few commits. ( #2591 , #2593 , #2594 )
5 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 )
5 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
5 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.
5 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
5 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 )
5 years ago
2742663ad2
Changelog, minor tweaks. ( #2585 )
5 years ago
c0e690318a
Examples: imgui_impl_osx: Added mouse cursor support. ( #2585 , #1873 )
5 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.
5 years ago
Rokas Kupstys
omar
Konstantin Podsvirov
dawid
Funto
Ilya.Sevrikov
malte-v
Egor Yusov
Harris Brakmic
osheriff
NeroBurner
Rokas Kupstys
Matthias Moulin
Vilya Harvey
Chris Savoie
Aaron Cooper
Vincent Hamm
Vincent Hamm
Max Thrun
actboy168
Mario Botsch