Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-15 09:27:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,401 Commits 13 Branches 79 Tags 86 MiB
7794b104c5
Commit Graph

1218 Commits

Author SHA1 Message Date
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.
 2020-01-29 14:03:04 +01:00
omar
f5528001f6 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_opengl2.cpp
#	imgui.cpp
#	imgui_internal.h
 2020-01-27 14:57:00 +01:00
omar
4d4e3b97f4 TODO, Readme 
(dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)
 2020-01-27 12:37:06 +01:00
Konstantin Podsvirov
b887259974 Bindings: Improved FreeGLUT support for MinGW (#3004) 2020-01-27 12:11:29 +01:00
omar
f6da5000bf Backends: OpenGL2: Explicitly backup, setup and restore GL_TEXTURE_ENV to increase compatibility with legacy OpenGL applications. (#3000) 2020-01-23 16:20:37 +01:00
Rokas Kupstys
7a22767483 CI: Add MSVC extra warnings build and correct labels of other extra warnings builds. 2020-01-22 14:17:03 +01:00
omar
f1b5c742ff Viewports: Add various comments 2020-01-20 19:59:55 +01:00
omar
3fe6ae9732 Internals: Move some Nav functions and members around (no functional change) + Misc comments 2020-01-20 18:19:03 +01:00
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)
 2020-01-17 15:18:33 +01:00
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)
 2020-01-17 15:06:22 +01:00
omar
aa34681652 Backends: GLFW: inhibit error callback when creating cursors because X11 setups may be missing them + comment (#2980) 2020-01-17 11:36:56 +01:00
omar
44174b1fa1 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
#	imgui_internal.h
 2020-01-14 20:01:27 +01:00
omar
4f7bf7e96a Backends: Win32: Added support for #define IMGUI_IMPL_WIN32_DISABLE_GAMEPAD and IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT. (#2716) 2020-01-14 14:58:36 +01:00
omar
ff5299e0e0 Docs: FAQ, Comments. 2020-01-12 22:09:18 +01:00
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.
 2020-01-10 19:04:35 +01:00
omar
861f786d81 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_opengl3.cpp
#	imgui.cpp
 2020-01-10 14:38:09 +01:00
Rokas Kupstys
00c515f51a Add glbinding build sample to Makefiles of GL3 examples. (#2870) 2020-01-09 16:26:42 +01:00
Rokas Kupstys
f6951bb67d Viewports: SDL2: Honor NoTaskBarIcon flag under non Win32 OS. (#2117) 2020-01-07 21:13:24 +01:00
Rokas Kupstys
5e2329b98e Backends: GL3: Implement glbinding opengl loader support. (#2870) 2020-01-07 21:06:37 +01:00
omar
d581939387 Removed trailing spaces. 2020-01-06 15:24:16 +01:00
omar
c706ff6f3a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 2019-12-18 20:49:41 +01:00
omar
0f7105e156 Backends: SDL: Wayland: Use SDL_GetMouseState (amend 78ff147) (#2800, 2802) 2019-12-17 14:35:45 +01:00
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
 2019-12-17 14:33:36 +01:00
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
 2019-12-13 17:06:27 +01:00
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) 2019-12-06 15:12:26 +01:00
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]
 2019-12-06 10:43:27 +01:00
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) 2019-12-05 15:50:33 +01:00
omar
8342e5b91a Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4) 
Amend b5cad20d79, 945a509773
+ unrelated minor typos
 2019-12-05 15:45:30 +01:00
Rokas Kupstys
945a509773 Implement ImGuiMouseCursor_NotAllowed mouse cursor. 2019-12-05 15:32:10 +01:00
Rokas Kupstys
b5cad20d79 Implement new GLFW 3.4 resizing cursors. 2019-12-05 15:27:09 +01:00
omar
abaf0256b8 Version 1.75 WIP 
Added message to font file loading assert.
 2019-11-28 20:58:16 +01:00
omar
28dd8d7efd Docking: Fixed various conflicts not properly resolved on 813e0c1 
New git client confusion.
 2019-11-27 19:27:44 +01:00
Rokas Kupstys
bf6d1ba3d1 CI: Add 32/64 bit build variations to builds with extra warnings. 2019-11-27 16:20:19 +01:00
Rokas Kupstys
1742ca45c5 CI: Add unity builds test. (#2893) 2019-11-27 16:18:52 +01:00
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
 2019-11-26 12:23:43 +01:00
omar
bdce833636 Version 1.74 2019-11-25 18:38:53 +01:00
omar
26d177bc03 Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks 2019-11-25 18:29:28 +01:00
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)
 2019-11-25 16:38:21 +01:00
omar
ca63349eb4 Renamed XX-bits -> XX-bit in comments to match what the world appears to be using. 2019-11-20 11:58:25 +01:00
omar
4e90906b04 Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734) 
Using in Emscripten example.
 2019-11-19 21:14:44 +01:00
omar
69b5c2f541 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2019-11-08 15:45:12 +01:00
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] 2019-11-05 12:53:30 +01:00
Konstantin Podsvirov
916487a653 example_emscripten: skip outdated compiler option 
For more info see: https://github.com/ocornut/imgui/issues/2877
 2019-11-05 12:43:15 +01:00
omar
a704614b3e Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 2019-11-04 16:33:57 +01:00
Rokas Kupstys
c9182424a8 Normalize all the line endings. 
(cherry picked from commit f1772d44be09fd78bf5f1ebda44b39b96180d319)
 2019-11-04 15:28:31 +01:00
omar
b3e94f5de8 Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
#	imgui_widgets.cpp
 2019-10-29 17:21:19 +01:00
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] 2019-10-25 11:56:44 +02:00
dawid
4d0c88e9e6 Backends: GL3: Fix compile for < 3.2 bindings where glDrawElementsBaseVertex is not available. (#2866, #2852) 2019-10-25 11:42:55 +02:00
omar
0cbb96895a Merge branch 'master' into docking 
# Conflicts:
#	examples/imgui_impl_dx12.cpp
#	imgui.cpp
#	imgui.h
#	imgui_widgets.cpp
 2019-10-24 15:11:37 +02:00
Funto
75d540d336 Example: Emscripten: Fix for compilation (filesystem module is required) (#2734) 2019-10-23 16:55:26 +02:00