Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-24 04:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,126 Commits 13 Branches 79 Tags 86 MiB
features/new_begin_end
Commit Graph

1371 Commits

Author SHA1 Message Date
ocornut
4c201994d4 DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. (#3361) 2020-08-20 11:21:15 +02:00
ocornut
05bc204dbd Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.h
 2020-08-18 17:51:43 +02:00
ocornut
95c99aaa4b Version 1.78 2020-08-18 17:50:45 +02:00
omar
14539b3ed2
Update Emscripten readme about emrun (#3412) 2020-08-18 12:34:19 +02:00
omar
d3fcc37e9e
Update Emscripten readme about local XHR requests (#3412) 2020-08-18 12:27:40 +02:00
ocornut
25a9209b75 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
#	imgui_widgets.cpp
 2020-08-17 23:29:17 +02:00
omar
009276b6cb Backends: Allegro 5: Fixed horizontal scrolling direction with mouse wheel / touch pads (#3394, #2424, #1463) [@nobody-special666] 
Amend 7dea158175
+ Fix vsproj GUID
 2020-08-10 15:31:48 +02:00
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
 2020-08-10 11:35:51 +02:00
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?
 2020-08-10 11:33:59 +02:00
ocornut
ede8825fb2 Examples: Vulkan: Fixed GLFW+Vulkan and SDL+Vulkan clear color not being set. Broken by a06eb833 (#3390) 2020-08-07 15:24:00 +02:00
omar
a24578ec09 Examples: Switch most VS projects to enable Edit & Continue by default (may need to upgrade projects to latest toolchain) 2020-08-05 15:02:30 +02:00
omar
963839373c Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call). 2020-08-03 21:31:42 +02:00
Rokas Kupstys
3d4af15d1d Backends GLFW: Use GLFW_MOUSE_PASSTHROUGH when available. 2020-07-17 18:44:09 +02:00
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.
 2020-07-17 18:14:04 +02:00
omar
f79f0e42f7 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
 2020-07-14 18:38:47 +02:00
omar
fb7f6cab8c Backends: Amend, docs + extra comments. (#3330, #3245) 2020-07-10 14:36:00 +02:00
Moritz Heinemann
06f7854b16 Backends: OpenGL3: Add glad 2 to OpenGL loaders. (#3330) 2020-07-10 14:34:25 +02:00
omar
b626dd57d3 Backends: DX12, Viewports: Tidying up, renaming. 2020-07-10 12:20:03 +02:00
omar
cb1d578470 Backends: DX12, Viewports: Fixed issue on shutdown when viewports are disabled. (#3347) 2020-07-10 12:09:24 +02:00
omar
ab4ef822f0 Version 1.78 WIP 2020-06-30 16:56:09 +02:00
omar
90ea7e2f2f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
 2020-06-30 16:43:16 +02:00
Rokas Kupstys
0738611559 Misc: Bunch of code formatting changes suggested by a pass running 'astyle' 2020-06-30 16:37:21 +02:00
omar
ddabfc3477 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
 2020-06-29 17:15:40 +02:00
omar
9418dcb693 Version 1.77 
+ fix minor clang-tidy warnings which seems reasonable
 2020-06-29 15:54:28 +02:00
omar
20d61f5f62 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2020-06-20 22:06:01 +02:00
omar
99f68d7958 Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks. 2020-06-19 11:34:04 +02:00
ocornut
2665288b30 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2020-06-11 11:36:38 +02:00
ocornut
40b799023b Docs: Update fonts.md (#2861) + update all references to FONTS.txt 2020-06-09 16:56:48 +02:00
ocornut
8baa4ccff5 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2020-06-06 20:31:24 +02:00
Rokas Kupstys
5af8a8c7e8 CI: Extra warnings for builds with Clang. Backends: OpenGL3: Fix sign conversion warnings. 2020-06-05 15:50:12 +02:00
Rokas Kupstys
dc49b14e29 Misc: Fix examples of using other OpenGL3 bindings in Makefiles. 2020-06-05 14:05:39 +02:00
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 :)
 2020-06-05 01:23:18 +02:00
Giovanni Funchal
3f26a07ee1 Backends: OpenGL: Fixed loader auto-detection to not interfere with ES2/ES3 defines. (#3246) 2020-05-25 18:57:23 +02:00
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
 2020-05-25 18:32:15 +02:00
ocornut
a06eb83359 Examples: GLFW+Vulkan, SDL+Vulkan: Fix for handling of minimized windows. (#3259) 2020-05-25 18:15:59 +02:00
ocornut
bb2529dd48 Backends: SDL: Report a zero display-size when window is minimized, consistent with other backends. 2020-05-25 12:26:59 +02:00
ocornut
a056603d8b Backends: Vulkan: Rename internal helper ImGui_ImplVulkanH_CreateWindow to ImGui_ImplVulkanH_CreateOrResizeWindow 2020-05-25 12:12:02 +02:00
ocornut
9c209d5a90 Minor amend 9028088 (#3261) 2020-05-25 11:42:45 +02:00
Nicolas Burrus
43f79aa210 Backends: OSX: import the glfw workaround to avoid missing mouse clicks. (#3261) 2020-05-25 11:42:45 +02:00
Nicolas Burrus
39d17ca07f Examples: Apple: catch events from the right and other mouse buttons when using Cocoa. (#3260) 2020-05-25 11:29:41 +02:00
Espyo
f44962c01a
Backends: Allegro: Don't call AddInputCharacter if the pressed key has no character. (#3252) 2020-05-20 17:48:21 +02:00
omar
75bbbda645 Examples: Update comments to get SDL2 package with msys2's pacman (#3251) 2020-05-20 11:44:00 +02:00
omar
e4d8267188 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 2020-05-16 14:14:51 +02:00
Chris Savoie
03ea87ea28 Backends, Win32: Request monitor update when dpi awarness is enabled to make sure they have the correct dpi settings. 2020-05-11 19:31:35 +02:00
Albert Vaca
685ca27d84 Backends: OpenGL: On OSX, if unspecified by app, made default GLSL version 150. (#3199) 2020-05-08 17:32:34 +02:00
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.
 2020-05-08 17:26:46 +02:00
omar
582f4db59b Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
#	imgui_internal.h
 2020-05-07 22:13:47 +02:00
omar
11a3e75f47 Backends: Win32: Fix _WIN32_WINNT < 0x0600 (MinGW defaults to 0x502 == Windows 2003). (#3183) 2020-05-04 20:46:20 +02:00
omar
5116eee108 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 2020-05-04 15:05:07 +02:00
omar
099091280f Backends: DX10/DX11: Minor tweaks. 2020-05-04 11:40:31 +02:00
Silent
1e9abf60d1 Backends: Keep shader blobs as local variables. (#3176) 2020-05-04 11:22:43 +02:00
omar
d5ce3b43ae Backends: Vulkan: Fixed error in if initial frame has no vertices. (#3177) 2020-05-04 11:03:41 +02:00
Chris Savoie
73c30aa085 Backends: Vulkan: Don't skip drawing when there's no vertexes to ensure that user callbacks are still processed. 2020-04-26 20:26:06 +02:00
Matt Haynie
d3212482fe
Fix multiple macro definitions of GLFW_INCLUDE_NONE (#3157) 2020-04-23 22:58:45 +02:00
u3shit
528b12eb7a Fix glClipControl(GL_UPPER_LEFT) handling in opengl3. 2020-04-22 10:10:51 +02:00
ocornut
266dff9bed Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
 2020-04-20 11:33:56 +02:00
omar
37f665b619 Backends: Win32: Support for #define NOGDI, won't try to call GetDeviceCaps(). (#3137, #2327) 2020-04-19 17:52:09 +02:00
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
 2020-04-18 11:27:34 +02:00
omar
e8c986b34e Version 1.77 WIP 2020-04-14 14:55:50 +02:00
SergeyN
013013737f Viewports, Backends: DX12: Fix for crash caused by early resource release. (#3121) 2020-04-13 15:26:03 +02:00
omar
b8e2b2bd6b Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 2020-04-12 20:24:18 +02:00
omar
5503c0a12e Version 1.76 
+ fixed PVS warning, update demo binaries, update readme image
 2020-04-12 20:18:47 +02:00
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) 2020-04-12 18:01:10 +02:00
SergeyN
977ac53dd8 Examples: Win32+DX12: Fixed resizing main window, enabled debug layer. (#3087, #3115) 2020-04-12 09:55:56 +02:00
Rokas Kupstys
c142540705 Viewports, Backends: GLFW: Avoid using window positioning workaround for glfw versions that have it fixed. Amend 09780b8. 2020-04-07 14:15:46 +02:00
omar
e9366b4c73 Regretfully moved .gitignore file from examples/ into root directory because OSX keeps pooping its DS_Store/ artifacts everywhere. (#3088) 2020-04-07 11:56:51 +02:00
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) 2020-04-07 11:02:43 +02:00
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.
 2020-04-07 11:01:37 +02:00
omar
3930472f34 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2020-04-06 18:16:13 +02:00
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.
 2020-04-03 12:41:33 +02:00
omar
0e884304ee Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui.h
 2020-04-02 14:27:48 +02:00
omar
f2b01c3436 Changelog, tweak OpenGL3 backends. (#3061), update Gallery thread links. 2020-03-24 18:45:05 +01:00
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
 2020-03-24 18:36:34 +01:00
omar
16a9488c13 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
 2020-03-19 12:44:53 +01:00
omar
d8824f9a9a CI: Clarify purpose of example_null, Changelog 2020-03-19 11:13:52 +01:00
Rokas Kupstys
ac5ffffc23 CI: Test builds with freetype on linux. 2020-03-19 11:05:53 +01:00
ocornut
ea0399414c Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
 2020-03-11 22:30:34 +01:00
ocornut
1abb02fb67 Viewports: Fix for UWP on IME code moved back-end side (#2895, #2892) + Docking: Comments. 2020-03-11 22:28:31 +01:00
ocornut
b016f1ad70 Examples: SDL+DX11: Fixed resizing main window. Amend (#3057) 2020-03-11 21:22:52 +01:00
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).
 2020-03-11 21:22:52 +01:00
ocornut
aef057e975 Internals: Added GetInputTextState() + comments. 2020-03-07 15:55:05 +01:00
ocornut
fbaf65b8f6 Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)" 
This reverts commit f2c7f3b200.
 2020-03-06 17:53:09 +01:00
ocornut
f2c7f3b200 Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542) 2020-03-06 17:28:32 +01:00
ocornut
a7ace918fe Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_win32.cpp
#	imgui.cpp
 2020-03-05 11:48:57 +01:00
ocornut
a41332453e Unicode: Changelog, comments, minimum CI integration. (#2541, #2538, #2815) 2020-03-03 18:53:29 +01:00
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
 2020-03-03 18:53:29 +01:00
ocornut
05c3e0b898 Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 2020-03-03 17:03:47 +01:00
ocornut
0345324646 Backends: SDL: Fixed mapping for ImGuiKey_KeyPadEnter. (#3031) [@Davido71] 2020-02-20 12:28:06 +01:00
ocornut
7d80a8f4f5 Backends: Fix ImGui_ImplSDL2_InitForMetal() in docking branch. 2020-02-20 12:21:11 +01:00
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
 2020-02-17 18:33:59 +01:00
Omar
b62f1ea8e9 Fix zealous PVS studio warnings. Minor tweaks. 2020-02-17 16:17:46 +01:00
Omar
ceec3cd3fd Backends: Win32: Added ImGui_ImplWin32_EnableDpiAwareness(), ImGui_ImplWin32_GetDpiScaleForHwnd(), ImGui_ImplWin32_GetDpiScaleForMonitor() helpers functions. 
(backported from the docking branch)
 2020-02-17 11:15:40 +01:00
Omar
8601187fee Backends: Win32: Clarify how the WndProc handler requires a forward declaration. 2020-02-17 10:22:39 +01:00
omar
ccaec1a270 Version 1.76 WIP 2020-02-11 16:56:56 +01:00
Rokas Kupstys
21b9e42964 Minor fixes to example_sdl_metal and a changelog entry. 
Add example_sdl_metal to CI builds.

Closes #3017.
 2020-02-10 16:53:37 +01:00
coding_jackalope
f346b4b302 Examples: SDL+Metal example. 2020-02-10 16:53:27 +01:00
omar
8432d1bfc7 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 2020-02-10 14:03:12 +01:00
omar
58b3e02b95 Version 1.75 
Comments
 2020-02-10 14:02:41 +01:00
omar
7e2d172ae5 Backends: GLFW, SDL: Platform monitors declared properly even if multi-viewport is not enabled. 2020-02-09 17:31:18 +01:00
omar
5be649e082 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2020-02-02 21:21:54 +01:00