Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,698 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cbade7b16d'
${ noResults }
Commit Graph

1303 Commits (cbade7b16d3b7f1bbcd257a9639209e937a88224)

Author SHA1 Message Date
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
Konstantin Podsvirov b887259974 Bindings: Improved FreeGLUT support for MinGW (#3004) 5 years ago
omar f6da5000bf Backends: OpenGL2: Explicitly backup, setup and restore GL_TEXTURE_ENV to increase compatibility with legacy OpenGL applications. (#3000) 5 years ago
Rokas Kupstys 7a22767483 CI: Add MSVC extra warnings build and correct labels of other extra warnings builds. 5 years ago
omar f1b5c742ff Viewports: Add various comments 5 years ago
omar 3fe6ae9732 Internals: Move some Nav functions and members around (no functional change) + Misc comments 5 years ago
omar 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
omar 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
omar aa34681652 Backends: GLFW: inhibit error callback when creating cursors because X11 setups may be missing them + comment (#2980) 5 years ago
omar 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
omar 4f7bf7e96a Backends: Win32: Added support for #define IMGUI_IMPL_WIN32_DISABLE_GAMEPAD and IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT. (#2716) 5 years ago
omar ff5299e0e0 Docs: FAQ, Comments. 5 years ago
Rokas Kupstys 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
omar 861f786d81 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 5 years ago
Rokas Kupstys 00c515f51a Add glbinding build sample to Makefiles of GL3 examples. (#2870) 5 years ago
Rokas Kupstys f6951bb67d Viewports: SDL2: Honor NoTaskBarIcon flag under non Win32 OS. (#2117) 5 years ago
Rokas Kupstys 5e2329b98e Backends: GL3: Implement glbinding opengl loader support. (#2870) 5 years ago
omar d581939387 Removed trailing spaces. 5 years ago
omar c706ff6f3a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 5 years ago
omar 0f7105e156 Backends: SDL: Wayland: Use SDL_GetMouseState (amend 78ff147) (#2800, 2802) 5 years ago
NeroBurner-tux 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
omar 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
Rokas Kupstys 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
omar 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
Max Thrun 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
omar 8342e5b91a Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4) 
Amend b5cad20d79, 945a509773
+ unrelated minor typos
 5 years ago
Rokas Kupstys 945a509773 Implement ImGuiMouseCursor_NotAllowed mouse cursor. 5 years ago
Rokas Kupstys b5cad20d79 Implement new GLFW 3.4 resizing cursors. 5 years ago
omar abaf0256b8 Version 1.75 WIP 
Added message to font file loading assert.
 5 years ago
omar 28dd8d7efd Docking: Fixed various conflicts not properly resolved on 813e0c1 
New git client confusion.
 5 years ago
Rokas Kupstys bf6d1ba3d1 CI: Add 32/64 bit build variations to builds with extra warnings. 5 years ago
Rokas Kupstys 1742ca45c5 CI: Add unity builds test. (#2893) 5 years ago
omar 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
omar bdce833636 Version 1.74 5 years ago
omar 26d177bc03 Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks 5 years ago
Rokas Kupstys 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
omar ca63349eb4 Renamed XX-bits -> XX-bit in comments to match what the world appears to be using. 5 years ago
omar 4e90906b04 Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734) 
Using in Emscripten example.
 5 years ago
omar 69b5c2f541 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 5 years ago
omar 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
Konstantin Podsvirov 916487a653 example_emscripten: skip outdated compiler option 
For more info see: https://github.com/ocornut/imgui/issues/2877
 5 years ago
omar a704614b3e Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 5 years ago
Rokas Kupstys c9182424a8 Normalize all the line endings. 
(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319)
 5 years ago
omar b3e94f5de8 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp
 5 years ago
omar 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
dawid 4d0c88e9e6 Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. (#2866, #2852) 5 years ago
omar 0cbb96895a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp
 5 years ago
Funto 75d540d336 Example: Emscripten: Fix for compilation (filesystem module is required) (#2734) 5 years ago
omar 048b73dfaa Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code. 5 years ago
omar 7b77cb3bb8 Backend: DX12: Fixed incorrect assert (#2851) 5 years ago
omar 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
omar 6faad0c34f Backend: DX12: Amend 899e485. Fix memory leaks. Remove unused variable. (#2851) 
(cherry picked from commit 39e2db6d94c295e7468c6a5fb39d247c641fb123)
 5 years ago
Ilya.Sevrikov 05c1f2795a Add multi-viewports for DX12. (#2851) 
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
 5 years ago
omar eedc8f993f Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled. 5 years ago
omar 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
malte-v 4de32cc87e Backends: GLFW: Restore previously installed user callbacks in ImplGlfw when ImGui shuts down (#2836) 5 years ago
omar 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
omar 3bbc27ebd9 Fixed more FAQ links. (#2848) 5 years ago
Rokas Kupstys 9d6b2b096b Ignore directories created by JetBrains IDEs. 
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
 5 years ago
Rokas Kupstys 6892b81578 Remove trailing spaces from bunch of files. 
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
 5 years ago
omar fc10ba8d24 Amend f0238ece9cba67ecabef438008fea53682bd6bc7 (#2817, #2818) 5 years ago
Egor Yusov 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
omar bf4880f6a2 Merge branch 'master' into docking 5 years ago