9d6b2b096b
Ignore directories created by JetBrains IDEs.
...
(cherry picked from commit c470de572c2f63e7ba5eeb7d97bc1f4bc114b375)
2019-10-15 17:15:45 +02:00
6892b81578
Remove trailing spaces from bunch of files.
...
(cherry picked from commit 50e0f8d4ddf4c426f62f346c8260a927f6b7c779)
2019-10-15 16:04:02 +02:00
fc10ba8d24
Amend f0238ece9cba67ecabef438008fea53682bd6bc7 ( #2817 , #2818 )
2019-10-11 14:20:04 +02:00
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
bf4880f6a2
Merge branch 'master' into docking
2019-10-07 19:14:37 +02:00
323412dd23
Examples: Allegro5: updated build instructions for macOS
2019-10-07 15:52:09 +02:00
e0c0e53edf
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-10-04 19:22:42 +02:00
a2f3dcfc97
Added comment about SDL and SDL_INIT_GAMECONTROLLER. ( #2809 )
2019-10-02 11:40:03 +02:00
c262276988
Version 1.74 WIP
2019-09-30 14:27:56 +02:00
f0f5301612
Backends: OpenGL3: Commented out extra tokens at end of #else directive ( #2804 )
2019-09-25 00:06:14 +02:00
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
d5efe16157
Version 1.73
2019-09-24 17:02:26 +02:00
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
44cd8e39da
Automatically include the available gl loader header
2019-09-22 22:51:09 +02:00
3233d85d2f
Merge branch 'master' into docking
2019-09-22 22:16:11 +02:00
f7468d05fe
Fixed mouse event forwarding in macos example ( #2710 , #1961 )
2019-09-20 15:48:51 +02:00
cf98290873
Backends: DirectX9: Workaround for windows not refreshing when main viewport has no draw call. ( #2560 )
2019-09-17 18:32:26 +02:00
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
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
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
a4af3cc814
Viewport, GLFW: Fix for #2756 under Windows.
2019-08-29 15:53:33 +02:00
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
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
e1fca8d982
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2019-08-23 12:21:49 +02:00
a856c670c1
TabBar: fixed single-tab not shrinking their width down.
...
+ minor typo fixes (#2738 )
2019-08-22 11:38:58 +02:00
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
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
62143dff64
Backends: Vulkan: Added support for specifying multisample count. ( #2705 , #2706 )
2019-08-01 11:10:01 -07:00
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
f624455d7b
Version 1.73 WIP
2019-08-01 10:57:13 -07:00
b8d8355f10
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
2019-07-31 14:34:58 -07:00
6a0d0dab5a
Version 1.72b (patch for nav)
2019-07-31 14:31:06 -07:00
9183e7c426
Version 1.73 WIP
2019-07-29 15:54:32 -07:00
949a9fa2cb
Vulkan: Fix crash when viewports are disabled and memory leak on shutdown. ( #2698 )
2019-07-29 15:52:30 -07:00
a1164399b0
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-07-27 18:21:41 -07:00
ecb9b1e2eb
Version 1.72
2019-07-27 18:15:07 -07:00
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
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
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
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
f0348ddffc
Amend 0f86116, renamed to ImGuiKey_KeyPadEnter Changelog.. ( #2677 , #2005 )
2019-07-21 18:39:50 -07:00
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
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
3e8eebfbec
Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. ( #1542 , #2635 )
2019-06-18 23:16:52 +02:00
2cbc0f1287
Restore SLN which in Docking branch includes more projects.
2019-06-18 23:13:12 +02:00
e2c1f0a7cd
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
2019-06-18 23:12:50 +02:00
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
cc4d76cc23
Implement SDL/dx11 sample
2019-06-18 11:05:29 +02:00
342751c89e
Fiedx OpenGL ES 3.0 include for iOS and tvOS ( #2631 )
2019-06-18 10:55:33 +02:00
b27fd87177
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
2019-06-17 11:10:14 +02:00
