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
omar
05a49f0413
Examples: Emscripten: Demonstrating embedding fonts in Makefile and code. ( #2953 ) [@Oipo]
2020-01-30 17:15:15 +01:00
omar
e7bfcb970e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2020-01-30 15:21:16 +01:00
omar
0a23582718
Examples: VS projects: Removed inconsistent/extraneous explicit linkage to imm32.
2020-01-29 20:11:42 +01:00
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
omar
048b73dfaa
Various comments + Doc: Examples readme. Moved main menu bar code below menu bar code.
2019-10-21 20:57:07 +02:00
omar
7b77cb3bb8
Backend: DX12: Fixed incorrect assert ( #2851 )
2019-10-21 13:38:33 +02:00
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.
2019-10-18 18:32:48 +02:00
omar
6faad0c34f
Backend: DX12: Amend 899e485. Fix memory leaks. Remove unused variable. ( #2851 )
...
(cherry picked from commit 39e2db6d94c295e7468c6a5fb39d247c641fb123)
2019-10-18 18:21:44 +02:00
Ilya.Sevrikov
05c1f2795a
Add multi-viewports for DX12. ( #2851 )
...
(cherry picked from commit 899e48565d1ecefde06063f99c75e702adcef175)
2019-10-18 18:21:35 +02:00
omar
eedc8f993f
Examples: DX12: Using IDXGIDebug1::ReportLiveObjects() when DX12_ENABLE_DEBUG_LAYER is enabled.
2019-10-18 18:20:53 +02:00
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
2019-10-18 16:50:30 +02:00
malte-v
4de32cc87e
Backends: GLFW: Restore previously installed user callbacks in ImplGlfw when ImGui shuts down ( #2836 )
2019-10-18 16:27:40 +02:00
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.
2019-10-18 16:18:05 +02:00
omar
3bbc27ebd9
Fixed more FAQ links. ( #2848 )
2019-10-16 11:23:15 +02:00
Rokas Kupstys
9d6b2b096b
Ignore directories created by JetBrains IDEs.
...
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
2019-10-15 17:15:45 +02:00
Rokas Kupstys
6892b81578
Remove trailing spaces from bunch of files.
...
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
2019-10-15 16:04:02 +02:00
omar
fc10ba8d24
Amend f0238ece9c
( #2817 , #2818 )
2019-10-11 14:20:04 +02:00
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
2019-10-11 14:17:07 +02:00
omar
bf4880f6a2
Merge branch 'master' into docking
2019-10-07 19:14:37 +02:00
Harris Brakmic
323412dd23
Examples: Allegro5: updated build instructions for macOS
2019-10-07 15:52:09 +02:00
omar
e0c0e53edf
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-10-04 19:22:42 +02:00
omar
a2f3dcfc97
Added comment about SDL and SDL_INIT_GAMECONTROLLER. ( #2809 )
2019-10-02 11:40:03 +02:00
omar
c262276988
Version 1.74 WIP
2019-09-30 14:27:56 +02:00
Konstantin Podsvirov
f0f5301612
Backends: OpenGL3: Commented out extra tokens at end of #else directive ( #2804 )
2019-09-25 00:06:14 +02:00
omar
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
2019-09-24 17:14:51 +02:00
omar
d5efe16157
Version 1.73
2019-09-24 17:02:26 +02:00
omar
97691643b7
Backends: OpenGL3: Attempt to automatically detect default GL loader by using __has_include. Followup to 44cd8e3
( #2798 )
2019-09-22 23:19:04 +02:00
osheriff
44cd8e39da
Automatically include the available gl loader header
2019-09-22 22:51:09 +02:00
omar
3233d85d2f
Merge branch 'master' into docking
2019-09-22 22:16:11 +02:00
omar
f7468d05fe
Fixed mouse event forwarding in macos example ( #2710 , #1961 )
2019-09-20 15:48:51 +02:00
omar
cf98290873
Backends: DirectX9: Workaround for windows not refreshing when main viewport has no draw call. ( #2560 )
2019-09-17 18:32:26 +02:00
omar
575df6f192
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
2019-09-17 16:35:50 +02:00
NeroBurner
e7e88ed413
Examples: SDL/GLFW + OpenGL3: Fixes for Makefile ( #2774 )
...
- append CXXFLAGS instead of overwriting them
- add glad.c build rule
2019-09-17 17:04:40 +09:00
omar
cc288e073c
Backends: OpenGL3: Tweaked initialization code allow application calling ImGui_ImplOpenGL3_CreateFontsTexture() before ImGui_ImplOpenGL3_NewFrame() if for some reason they wanted.
2019-09-16 12:08:40 +02:00
omar
a4af3cc814
Viewport, GLFW: Fix for #2756 under Windows.
2019-08-29 15:53:33 +02:00
Rokas Kupstys
a89a3cd2f1
Viewports, GLFW: Fix window having incorrect size after uncollapse. Issue manifests on Linux when window is in it's own viewport. ( #2756 , #2117 )
2019-08-29 15:49:52 +02:00
Rokas Kupstys
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.
2019-08-29 13:02:42 +02:00
omar
e1fca8d982
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-08-23 12:21:49 +02:00
omar
a856c670c1
TabBar: fixed single-tab not shrinking their width down.
...
+ minor typo fixes (#2738 )
2019-08-22 11:38:58 +02:00
omar
aedcd2fb1a
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx11.cpp
# imgui.cpp
2019-08-19 21:49:53 +02:00
Matthias Moulin
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]`
2019-08-12 22:31:49 +02:00
Vilya Harvey
62143dff64
Backends: Vulkan: Added support for specifying multisample count. ( #2705 , #2706 )
2019-08-01 11:10:01 -07:00
omar
6cf4743f17
Backends: DX11: Fixed GSGetShader() call not passing an initialized instance count, would generally make the debug layer complain (Added in 1.72).
2019-08-01 10:58:41 -07:00
omar
f624455d7b
Version 1.73 WIP
2019-08-01 10:57:13 -07:00
omar
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-07-31 14:34:58 -07:00
omar
6a0d0dab5a
Version 1.72b (patch for nav)
2019-07-31 14:31:06 -07:00
omar
9183e7c426
Version 1.73 WIP
2019-07-29 15:54:32 -07:00
Chris Savoie
949a9fa2cb
Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. ( #2698 )
2019-07-29 15:52:30 -07:00
omar
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-07-27 18:21:41 -07:00
omar
ecb9b1e2eb
Version 1.72
2019-07-27 18:15:07 -07:00
omar
0e6a096afd
Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. ( #2109 )
...
Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.
2019-07-22 11:29:22 -07:00
omar
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
2019-07-22 10:29:14 -07:00
omar
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.
2019-07-21 19:26:13 -07:00
omar
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 )
2019-07-21 19:06:07 -07:00
omar
f0348ddffc
Amend 0f86116
, renamed to ImGuiKey_KeyPadEnter Changelog.. ( #2677 , #2005 )
2019-07-21 18:39:50 -07:00
Aaron Cooper
0f86116a69
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
2019-07-21 18:29:11 -07:00
omar
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 )
2019-06-18 23:37:57 +02:00
Vincent Hamm
3e8eebfbec
Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. ( #1542 , #2635 )
2019-06-18 23:16:52 +02:00
omar
2cbc0f1287
Restore SLN which in Docking branch includes more projects.
2019-06-18 23:13:12 +02:00
omar
e2c1f0a7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-06-18 23:12:50 +02:00
omar
516c3dee80
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. ( #2632 )
2019-06-18 11:28:26 +02:00
Vincent Hamm
cc4d76cc23
Implement SDL/dx11 sample
2019-06-18 11:05:29 +02:00
Vincent Hamm
342751c89e
Fiedx OpenGL ES 3.0 include for iOS and tvOS ( #2631 )
2019-06-18 10:55:33 +02:00
omar
b27fd87177
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
2019-06-17 11:10:14 +02:00
omar
5286ecb8a7
Version 1.72 WIP
2019-06-14 11:58:58 +02:00
omar
d3d998a885
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
2019-06-12 18:40:50 +02:00
omar
2da1c66d15
Version 1.71 + comments
2019-06-12 18:30:06 +02:00
omar
4597632662
Readme, comments, dear imgui prefixes
2019-06-11 16:11:36 +02:00
omar
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.
2019-06-06 16:16:18 +02:00
omar
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.
2019-06-06 16:13:30 +02:00
omar
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
.
2019-06-06 01:00:30 +02:00
omar
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 )
2019-06-06 00:42:27 +02:00
omar
cc48f1e5dd
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
2019-05-30 16:47:11 +02:00
omar
c3d600abed
Fixed imgui_impl_opengl3 broken in previous few commits. ( #2591 , #2593 , #2594 )
2019-05-30 16:45:59 +02:00
Max Thrun
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 )
2019-05-29 19:45:15 +02:00
omar
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
2019-05-29 16:32:27 +02:00
omar
7755cbbef2
Renamed ImGuiBackendFlags_HasVtxOffset to ImGuiBackendFlags_RendererHasVtxOffset to match naming convention already used in viewport/docking branch. ( #2591 ) + Fix OpenGL3 code missing flag.
2019-05-29 16:29:17 +02:00
omar
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
2019-05-29 16:20:26 +02:00
omar
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 )
2019-05-29 16:13:38 +02:00
omar
2742663ad2
Changelog, minor tweaks. ( #2585 )
2019-05-28 11:23:04 +02:00
actboy168
c0e690318a
Examples: imgui_impl_osx: Added mouse cursor support. ( #2585 , #1873 )
2019-05-28 11:15:59 +02:00
Mario Botsch
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.
2019-05-27 10:47:18 +02:00
omar
04022114d9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-05-21 14:47:29 +02:00
omar
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.
2019-05-18 17:44:09 +02:00
Andrew Willmott
02de498a41
Add native mac copy/paste support to match win32 ( #2546 )
2019-05-18 17:34:58 +02:00
omar
4158cba1ff
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
2019-05-13 19:23:18 +02:00
Alzathar
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).
2019-05-11 10:54:56 +02:00
omar
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 )
2019-05-11 10:33:56 +02:00
omar
835a8b2c9b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-05-10 22:56:43 +02:00
omar
42fc563fed
Version 1.71 WIP + fixed minor typo
2019-05-07 16:36:08 +02:00
omar
d1d5075b66
Version 1.70
2019-05-06 14:17:39 +02:00
omar
e6c982509d
Examples: DirectX9: Fixes for multi-viewports. Avoid using a depth/stencil target for secondary viewport. ( #2520 , #2502 )
2019-05-06 12:12:32 +02:00
omar
9ddb8493d5
Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. ( #2520 , #2502 )
2019-05-06 12:07:29 +02:00
omar
76e61958fd
Merge branch 'master' into docking
...
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
2019-05-06 10:16:43 +02:00
omar
d88121ff5b
Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524
2019-05-06 10:15:22 +02:00
omar
6c196cf432
Examples Readme and Changelog tweaks, added #2527 , re-ordered examples/README alphabetically.
2019-05-06 10:02:59 +02:00
Max Thrun
5ecc9d5865
Examples: Metal: Add GLFW+Metal example
2019-05-06 09:51:21 +02:00
ibachar
4f22a45cb5
Removed git merge leftovers
2019-05-04 15:02:28 +02:00
omar
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
2019-05-02 14:56:47 +02:00
omar
ae405b83a4
Examples: Added missing per-renderer local changelogs. ( #2037 , #1639 , #2452 )
2019-04-30 22:28:29 +02:00
Max Thrun
7c6ba3a1da
ImDrawCallback_ResetRenderState: Added Metal.
2019-04-30 22:18:25 +02:00
omar
5c1cd5c8c7
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. ( #2037 , #1639 , #2452 )
2019-04-30 22:15:59 +02:00
omar
a649d904d7
Examples: Emscripten: Fixed not enabling Docking and Nav by default. ( #2494 )
2019-04-26 00:28:28 +02:00
omar
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
2019-04-25 17:53:11 +02:00
omar
1ca6e5b59f
Examples: Glut: Added note about missing cursor support. ( #2375 , #2465 )
2019-04-25 12:01:01 +02:00
omar
6789ea3482
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. ( #2509 , #2484 ).
2019-04-23 12:38:59 +02:00
David Amador
994a92d79d
Added support to use controllers via SDL_GameController. ( #2509 )
...
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
2019-04-23 12:14:05 +02:00
omar
f159eb35fb
Examples: SDL: Removed unused code. ( #2484 )
2019-04-22 10:43:14 +02:00
omar
03b64defa5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-04-19 19:52:45 +02:00
Andre Weissflog
74a3878be4
emscripten: replace shell_minimal.html with 'soft fullscreen' version
2019-04-17 11:59:26 +02:00
omar
1f25cdd6b4
Clarified asserts comments + todo entries. ( #2500 )
2019-04-17 09:59:03 +02:00
omar
655ebe4eaf
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2019-04-16 13:14:10 +02:00
omar
8130fd9816
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). ( #2496 )
2019-04-15 18:47:36 +02:00
omar
1fe6533192
Examples: Emscripten: Tweaks for size. ( #2494 )
2019-04-15 17:18:31 +02:00
omar
b89202824e
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2019-04-15 16:03:17 +02:00
omar
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.
2019-04-15 15:48:38 +02:00
omar
eeea7da3d0
Examples: Emscripten: Fixed error in shell template. ( #2494 )
2019-04-15 01:46:34 +02:00
omar
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 )
2019-04-15 01:28:44 +02:00
omar
882d480b5e
Examples: Removed unused variable (will be used in docking branch tho, undo when merging!)
2019-04-15 01:01:39 +02:00
Nicolas "Pixel" Noble
a936d0669c
Adding standalone Emscripten example.
2019-04-13 22:39:42 +02:00
omar
328e4fa7e7
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
2019-04-11 15:53:38 +02:00
omar
b8fe0df7df
Examples: Null: Added Makefile.
2019-04-08 19:16:45 +02:00
omar
cf029b3e1c
Merge branch 'master' into docking
2019-04-08 18:05:52 +02:00
omar
42423d5ea4
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. ( #297 )
2019-04-07 23:02:07 +02:00
omar
1295205cd4
Examples: Vulkan: Fixed warnings. ( #2480 )
2019-04-07 22:27:45 +02:00
omar
7056032483
Merge branch 'vulkan_fix_docking' into docking
2019-04-07 16:23:34 +02:00
omar
50ceb25003
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
2019-04-07 16:23:31 +02:00
omar
c43dab2414
Vulkan: Fix not incrementing semaphore index. ( #2472 , #2071 )
2019-04-07 15:57:07 +02:00
omar
9c364b16ff
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
2019-04-05 20:30:42 +02:00
omar
e099a7dc74
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
2019-04-05 20:27:46 +02:00
omar
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 )
2019-04-05 18:52:45 +02:00
omar
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
2019-04-05 18:27:15 +02:00
omar
6bc47dfe48
Vulkan: Removed superfluous vkInstance parameters being passed along.
2019-04-05 18:24:28 +02:00
omar
452047c7ca
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
2019-04-05 18:24:28 +02:00
omar
ec76722d2d
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. ( #2472 , #2071 )
2019-04-05 17:22:24 +02:00
MindSpunk
a45840746e
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
2019-04-05 17:04:12 +02:00
MindSpunk
9acb158990
Vulkan, Viewports: Fix for resizing viewport windows crashing. ( #2472 )
2019-04-05 16:51:35 +02:00
omar
1ba79baab5
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. ( #2472 , #2461 , #2071 )
2019-04-05 16:33:41 +02:00
omar
01de69de36
Vulkan: Note for unsupported feature with multi-viewports. ( #2071 )
2019-04-05 00:25:42 +02:00
omar
8ec24036d7
Vulkan: Viewports: Removed redundant field.
2019-04-05 00:01:25 +02:00
omar
29269d2aa8
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
...
# Conflicts:
# examples/imgui_impl_vulkan.cpp
2019-04-04 23:55:33 +02:00
omar
0034e65c26
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
2019-04-04 23:40:28 +02:00
omar
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 )
2019-04-04 23:13:31 +02:00
omar
86f5945f49
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
2019-04-04 23:13:31 +02:00
omar
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 )
2019-04-04 22:27:29 +02:00
omar
6bf981c85c
Vulkan: More renaming. Comments.
2019-04-04 22:20:01 +02:00
omar
f586764cdd
Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. ( #2071 )
2019-04-04 22:12:16 +02:00
omar
54b8a65d9e
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. ( #2071 )
2019-04-04 22:12:15 +02:00
omar
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 )
2019-04-04 22:11:13 +02:00
omar
c7eef99a33
Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. ( #2071 )
2019-04-04 22:10:43 +02:00
MindSpunk
b88a3b2711
Examples: Vulkan: Added calls to supports runtime changing back buffer count. ( #2071 )
2019-04-04 22:10:43 +02:00
omar
43a85dd02e
Merge branch 'master' into docking
2019-04-04 22:10:18 +02:00
omar
1c3311e4d6
Vulkan: Avoid passing negative coordinates to vkCmdSetScissor, which debug validation layers do not like.
2019-04-04 22:09:26 +02:00
omar
fc52364652
Tabs to Spaces, comments.
2019-04-03 17:25:02 +02:00
omar
cdb109f617
Renamed freeglut vcxproj files + Comments, Changelog ( #2465 )
2019-04-03 16:25:35 +02:00
Andrew Willmott
ece322ff12
freeglut -> glut rename
2019-04-03 07:19:31 -07:00
Andrew Willmott
3fad375f5f
ifdef freeglut extensions properly
2019-04-03 07:19:31 -07:00
Andrew Willmott
81f70e5b7c
Fixups for OSX
2019-04-03 07:19:31 -07:00
Andrew Willmott
a402f5b9a9
Add makefile for freeglut
2019-04-03 07:19:31 -07:00
omar
5c4cc370bb
Examples: Vulkan: Added shader sources/references in the .cpp source.
2019-04-03 11:23:54 +02:00
omar
49fb8e6c45
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
2019-04-03 11:17:26 +02:00
omar
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.
2019-04-03 11:04:00 +02:00
omar
e3cd6b1cbb
Examples: Vulkan: Using IM_ARRAYSIZE() where possible.
2019-04-02 15:34:16 +02:00
omar
3a737e665a
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
2019-04-02 10:36:35 +02:00
omar
e21bbee311
Examples: DirectX9: Fixed erroneous assert in ImGui_ImplDX9_InvalidateDeviceObjects(). FreeType: Fixed suggested code to not require an initial build call.. ( #2454 )
2019-03-29 18:32:57 +01:00
omar
163779da51
Examples: DirectX12: Various tidying up.
2019-03-29 16:23:37 +01:00
omar
512d39d031
Examples: OpenGL3: Minor tweaks, clarifications + not calling glBindBuffer more than necessary in the render loop.
2019-03-29 16:17:30 +01:00
omar
a33d45d7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-03-28 15:48:25 +01:00
omar
20188b19d6
Comments ( #2441 ) + Freeglut fixes ( #2430 )
2019-03-26 12:16:23 +01:00
omar
9350158d61
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
2019-03-25 16:08:09 +01:00
omar
221bf93a55
Comments, todo list, remove trailing spaces.
2019-03-17 00:56:21 +01:00
omar
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 )
2019-03-15 13:09:07 +01:00
omar
cf2c52282d
Version 1.70 WIP
2019-03-15 13:07:30 +01:00
omar
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
2019-03-13 15:30:35 +01:00
omar
55c02099c5
Version 1.69, comments, typos
2019-03-13 15:29:43 +01:00
omar
a26085ed53
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items ( #211 ) + Examples comments
2019-03-12 22:23:56 +01:00
omar
9afb849e16
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
2019-03-12 18:28:47 +01:00
omar
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 )
2019-03-12 18:27:14 +01:00
omar
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
2019-03-11 16:08:16 +01:00
omar
6767b0a1b0
Examples: Win32+DirectX: moved helper functions below main.
2019-03-11 16:00:18 +01:00
omar
3eedb542a6
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
2019-03-11 11:07:23 +01:00
Bruce Mitchener
b5d57a6615
Fix typos. ( #2413 )
2019-03-09 10:10:17 +01:00
Gilad Reich
0a6c5bc234
Examples: DirectX9: Added support for multi-viewport ( #2394 )
2019-03-06 21:36:42 +01:00
omar
e91d275b10
Merge branch 'master' into docking
...
# Conflicts:
# imgui_demo.cpp
2019-03-06 21:18:46 +01:00
omar
510342f024
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. ( #2394 )
2019-03-06 18:00:04 +01:00
omar
49eb5f0280
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
2019-03-03 23:34:56 +01:00
omar
beb3062dc5
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
2019-03-03 23:34:28 +01:00
omar
9d1a392d7d
Examples: OpenGL: Comments about versions and loaders. ( #2393 , #2351 )
2019-03-03 23:25:51 +01:00
Richard Mitton
7a536f1bd2
Examples + Viewport: GLFW: context wasn't set when using multiple windows. ( #2392 )
2019-03-03 23:01:43 +01:00
omar
ff0c6c2bde
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-02-27 19:00:09 +01:00
omar
75641926e1
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
...
# Conflicts:
# examples/imgui_impl_allegro5.cpp
2019-02-27 14:39:41 +01:00
omar
87ded34f9f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
2019-02-22 12:29:18 +01:00
omar
2068dd509c
Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. ( #2366 , #2186 )
2019-02-20 14:31:19 +01:00
omar
d0c98bf880
Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
2019-02-19 20:13:06 +01:00
omar
ff0f9aa856
Comments for Linux/Mac ( #2117 )
2019-02-19 16:36:06 +01:00
omar
5bf9029bf9
Merge branch 'master' into docking
2019-02-18 12:16:13 +01:00
omar
d972533d09
Examples: Vulkan: Rewrote scissor processing to match other examples more closely. Removed extraneous +1 of scissor extent height.
2019-02-16 12:33:38 +01:00
omar
dd14adc731
Examples: Vulkan: Support draw_data->FramebufferScale correctly matching a79785c
for on Metal/GL2/GL3. ( #2306 , #1676 )
2019-02-16 12:32:44 +01:00
omar
f977871854
ImFont: Minor adjustment to the structure.
...
Examples: Removed unused variable.
2019-02-15 18:56:08 +01:00
omar
09c9bf2edb
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
2019-02-14 20:35:11 +01:00
omar
93d1179805
Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency.
...
Added more link to nothing's oversample document. Spacing bits.
2019-02-14 19:29:09 +01:00
omar
b46076458c
Examples: Win32: Removed unused code left-over from merge e9c625a1dc
2019-02-13 18:29:49 +01:00
omar
8691b56136
Merge branch 'master' into docking
2019-02-12 10:30:48 +01:00
omar
cc80d8e118
Examples: Metal: Compilation fix.
2019-02-12 10:30:09 +01:00
omar
169e3981fd
Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings.
2019-02-11 19:09:54 +01:00
omar
7f6a025c93
Viewport: SDL: Inherit SDL_WINDOW_ALLOW_HIGHDPI flag from main viewport. ( #2306 )
2019-02-11 19:00:33 +01:00
omar
2cada3c143
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_widgets.cpp
2019-02-11 18:59:49 +01:00
omar
d16dbc5b87
Examples: SDL: Using the SDL_WINDOW_ALLOW_HIGHDPI flag. ( #2306 , #1676 ) [@rasky]
2019-02-11 18:52:08 +01:00
omar
a79785c0b9
ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale).
...
This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306 , #1676 )
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306 ) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.
2019-02-11 18:52:08 +01:00
Omar Cornut
ef7940699e
Examples: Metal: Removed unnecessary loop. Fixed OSX Clang warning in imstb_truetype. ( #1929 , #1873 )
2019-02-11 17:38:34 +01:00
omar
4a3a895be9
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2019-02-06 14:47:53 +01:00
omar
f366828dd2
Minor tweaks to reduce false positive of PVS Studio static analyzer.
2019-02-06 13:16:52 +01:00
omar
f6fbb99a9c
Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch.
2019-02-05 15:45:26 +01:00
omar
7227454dca
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
2019-02-03 17:31:16 +01:00
omar
03b0266b59
Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). ( #2327 )
2019-02-01 15:23:25 +01:00
omar
5fc6899dc2
Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [@BrutPitt]
2019-02-01 15:13:54 +01:00
omar
e1143377c2
Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. ( #1542 , #2117 )
...
Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.
2019-01-30 21:39:05 +01:00
omar
13a5f5ba8b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
2019-01-27 16:46:35 +01:00
omar
ab9cd44c89
Examples: DirectX9: Fix Clang warning.
2019-01-22 13:47:15 +01:00
omar
0947fa3de0
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-01-21 16:54:37 +01:00
omar
cb9a6b8a8b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/README.txt
# imgui.cpp
2019-01-21 16:52:22 +01:00
omar
54ba8a643e
Removed trailing spaces from text files. ( #2038 , #2299 )
2019-01-20 22:23:29 +01:00
omar
f94af2f5c5
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
2019-01-20 22:13:35 +01:00
omar
8079344cee
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
2019-01-20 22:12:06 +01:00
omar
259f3c78a2
Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. ( #2297 )
2019-01-20 18:13:39 +01:00
omar
2c38b32db1
Removed trailing spaces ( #2038 , #2299 )
2019-01-20 17:56:17 +01:00
omar
82e31d34f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
2019-01-18 12:31:33 +01:00
omar
295ada0364
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
2019-01-17 18:30:15 +01:00
omar
b8020032f9
Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. ( #2264 )
2019-01-17 16:55:23 +01:00
omar
acdb4823dd
Examples: Win32: Fix for older Windows SDK.
2019-01-17 14:35:26 +01:00
omar
b5144e477f
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-01-17 14:06:42 +01:00
omar
e9c625a1dc
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
2019-01-17 14:05:40 +01:00
omar
872477548b
Examples: Win32: Using IsChild() to be compatible with windows created within a parent. ( #1951 , #2087 , #2156 , #2232 )
2019-01-17 11:45:32 +01:00
Gilad Reich
14c40242db
Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. ( #2288 , #2290 )
2019-01-17 11:39:40 +01:00
omar
882f1bc135
Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).
2019-01-16 15:10:31 +01:00
omar
8a45c56c2c
Merge branch 'viewport' into docking
2019-01-15 21:22:29 +01:00
omar
9391a97fbf
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
2019-01-15 21:22:21 +01:00
omar
f435aa193b
Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
2019-01-15 21:19:02 +01:00
omar
133f112af0
Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created in a different thread. ( #1951 , #2087 , #2156 , #2232 ) [many people]
2019-01-15 20:27:32 +01:00
omar
6b32570644
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
2019-01-07 21:29:15 +01:00
omar
5af930f97a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-01-07 21:28:29 +01:00
DomRe
4483320f0a
Examples: Allegro 5: Properly destroy all globals on shutdown. ( #2262 )
2019-01-04 13:30:55 +01:00
Alzathar
25ac85f15d
Examples: Downgrading projects to xcode 9.2 (maybe 8.0) ( #2134 )
...
* example_apple_opengl2: The deployment target was set to 10.12 from XCode 9.2.
* imgui_impl_metal: header not found by XCode 9.2.
* example_apple_metal: The deployment target was set to 10.12 from XCode 9.2.
2019-01-03 14:01:14 +01:00
omar
ce1626a51e
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2019-01-02 21:36:21 +01:00
omar
0cabe4dedf
Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. ( #1542 )
2019-01-02 21:33:23 +01:00
omar
cfcad42b89
Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. ( #1542 )
2019-01-02 19:03:45 +01:00
omar
4a6f95acc8
Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
2019-01-02 19:03:36 +01:00
omar
951c9dd68b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2019-01-02 19:00:31 +01:00
omar
d9a4cbc429
Examples: Comments about GLFW/SDL versions
2019-01-02 16:04:13 +01:00
omar
a9a60a24c1
Tweaked asserts
2018-12-23 17:51:50 +01:00
omar
a71d3c8cb3
Viewport: Misc comments following user feedbacks..
2018-12-21 18:40:16 +01:00
omar
238321c159
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
2018-12-21 16:56:26 +01:00
omar
e181b0c3fc
Merge branch 'viewport' into docking
2018-12-21 16:53:13 +01:00
omar
2889a14f86
Build fix for master.
2018-12-21 16:45:24 +01:00
omar
9d0bc3f9ab
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2018-12-21 16:43:12 +01:00
omar
b1cd52b674
Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). ( #421 )
2018-12-21 16:41:29 +01:00
omar
afe9c5c5f7
Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to 8dd83c5
. ( #1542 , #2117 )
2018-12-21 16:26:17 +01:00
omar
81a2546cea
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
2018-12-20 23:06:29 +01:00
omar
ee5560a958
Merge branch 'master' into viewport + added style tweak block when viewports are enabled
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
2018-12-20 23:04:40 +01:00
omar
d5b22fb635
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
2018-12-20 22:58:34 +01:00
omar
62cfdceac1
Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. ( #1542 )
2018-12-20 22:40:22 +01:00
omar
8dd83c5fe8
Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. ( #1542 , #2117 )
2018-12-20 22:28:31 +01:00
omar
088ef6623a
Merge branch 'viewport' into docking
2018-12-18 15:03:01 +01:00
omar
5d20da1b36
Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. ( #1676 )
2018-12-14 12:12:26 +01:00
omar
e6439e1a16
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
2018-12-10 16:21:49 +01:00
omar
f768727284
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
2018-12-06 16:36:17 +01:00
omar
f3a0b17bb8
Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. ( #1542 , #2117 ) + various comments.
2018-12-06 16:30:10 +01:00
omar
5105c6c0d0
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2018-12-04 00:06:26 +01:00
omar
3a678d48b1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
2018-12-04 00:05:45 +01:00
omar
8d58055a54
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
2018-12-03 17:47:10 +01:00
omar
ac10889bde
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2018-12-03 11:44:51 +01:00
omar
89a530b442
Somehow VS keeps modifying this GUID so I am going to playing along with it.
2018-12-03 11:44:08 +01:00
omar
65e579e558
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
2018-12-03 11:41:53 +01:00
omar
801645d350
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
2018-12-03 10:17:17 +01:00