omar
00418d13e3
Demo: Fixed mismatched TreePush/TreePop in Property Editor, due to incorrect revert in 826d77185e ( #1895 )
2018-06-22 17:45:03 +02:00
omar
ce500f8727
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
2018-06-22 12:01:42 +02:00
omar
d68633398b
Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.
2018-06-22 10:02:02 +02:00
omar
1b74e3be02
Version 1.62
2018-06-22 09:41:25 +02:00
omar
f9a5ff7a19
Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. ( #301 )
2018-06-21 12:13:04 +02:00
omar
cac4c3f9b8
Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. ( #1888 ) + Comments in imgui.h
2018-06-21 12:04:00 +02:00
omar
528b0b4af6
Examples: SDL+OpenGL2: Fixed Makefile. ( #1886 )
2018-06-20 11:17:33 +02:00
omar
c44a4bed84
Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. ( #1887 )
2018-06-20 11:06:29 +02:00
omar
2ce121b7d0
Readme, Links, Bindings
2018-06-16 10:43:05 +02:00
omar
40845852b9
Fixed warnings + readme
2018-06-16 10:23:11 +02:00
Omar Cornut
a402edb66c
Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. ( #1873 )
2018-06-15 23:01:26 +02:00
omar
9a5f742e63
Fixed merge.
2018-06-15 19:48:51 +02:00
omar
7e6700d261
Viewport: Fix lagging overlay clipping rectangle on viewport owning window (affecting sync of multi-layered docking overlays). This was extremely tricky to find and fix (*). ( #1541 )
...
(*) Merely assigning viewport->Pos = pos in UpdateMovingWindow() broke a series of thing because the code that assign viewports and viewport flags relied on moving window leaving its own viewport the first time to set the NoInputs flag.
2018-06-15 19:40:17 +02:00
omar
c71522adc5
Viewport: Comments. Removed misleading test for !window->ViewportOwned in UpdateSelectWindowViewport(). ( #1541 )
2018-06-15 19:40:00 +02:00
omar
70b0bd13aa
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
# imgui.h
2018-06-14 15:30:15 +02:00
omar
b5d385824d
Added assert in TreePop() to ease catching ID stack underflow earlier.
2018-06-14 15:11:14 +02:00
omar
826d77185e
Revert 640c0566: TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless -> more flexible to keep allowing it by default so it setup an ID scope.
2018-06-14 15:10:46 +02:00
omar
ce0b36ba10
Added _None values to various enum flags, useful for readability and some coding style likes it. (Unfortunately we can't refer to them as default value in imgui.h functions because they need to be declared below).
2018-06-13 23:22:19 +02:00
omar
2a6fbb2197
Speculative fix for Win32 clipboard handler if SetClipboardText() fails + Minor fix for static analyzer + using :: prefix when calling in Win32 functions.
2018-06-13 22:22:52 +02:00
omar
185b4dde87
Examples: Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. Added clipboard support. Unindexing buffers ourselves as Allegro indexed drawing primitives are buggy in the DirectX9 back-end.
2018-06-13 19:22:47 +02:00
omar
087ab2acbf
Examples: Fixed example vcproj names in Viewport branch.
2018-06-13 15:59:21 +02:00
omar
335f6fde7e
Comments + missing changelog bits in 1.52 for SetNextWindowPos, SetNextWindowPosCenter. (obsolete #771 )
2018-06-13 14:06:58 +02:00
omar
d57fc7fb97
Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. ( #820 , #956 , #1875 )
2018-06-13 00:10:33 +02:00
omar
be4b8b5615
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
2018-06-13 00:02:19 +02:00
omar
3569d74f98
Demo: Moved test of the Hovered/Active/Focused functions to the Widgets section.
2018-06-12 18:51:23 +02:00
omar
cd455a4600
Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. ( #820 , #956 , #1875 )
2018-06-12 18:44:33 +02:00
omar
c725710c6d
Comments
2018-06-12 18:25:04 +02:00
omar
24aeca3d0c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
2018-06-12 16:24:24 +02:00
omar
a48815b870
Comments, changelog
2018-06-12 12:12:56 +02:00
Omar Cornut
e54b61aa0f
Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. ( #1873 )
2018-06-11 21:07:14 +02:00
omar
f96c7fac91
Examples: FreeGLUT: Fixed mapping of Space key. ( #801 )
2018-06-11 20:03:35 +02:00
omar
cdf51cad2d
Comments, documentation
2018-06-11 19:52:40 +02:00
omar
a1b6766d43
Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. ( #801 )
2018-06-11 19:27:57 +02:00
omar
bdb3d72d37
Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). ( #1874 )
2018-06-11 17:36:18 +02:00
omar
7acb46bec5
Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible ( #1027 ). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag.
2018-06-11 12:33:51 +02:00
omar
fac0c801da
Examples: Added imgui_impl_osx.mm bindings ( #1870 , #281 )
2018-06-11 10:19:17 +02:00
omar
6f7b7807ad
Fixed Travis path + various paths in comments/documentations
2018-06-10 16:14:43 +02:00
omar
9660657e95
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
2018-06-10 15:59:35 +02:00
omar
5a13e4dcde
Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp ( #1870 ) + changelog bits
2018-06-10 15:58:21 +02:00
omar
8d58fbb5ed
Examples: Renamed example folders. ( #1870 )
2018-06-10 15:42:14 +02:00
omar
689ec0bd06
Merge branch 'font_min_max_advance'
2018-06-10 15:07:18 +02:00
omar
13a3a2d0f3
Merge branch 'examples_refactor2' into viewport ( #1870 )
...
# Conflicts:
# examples/README.txt
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# 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_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl2.cpp
# examples/imgui_impl_sdl2.h
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
2018-06-10 15:04:46 +02:00
omar
ff4f40de41
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
2018-06-08 20:22:07 +02:00
omar
85f9694bd4
Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ( #1870 )
...
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
2018-06-08 19:37:33 +02:00
omar
f5bf9f509c
ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. ( #1869 )
2018-06-08 12:52:46 +02:00
omar
24fc7c30dd
Examples: Documentation
2018-06-08 00:00:12 +02:00
omar
06aa9d8d9a
Examples: Fixed Makefile, batch files.
2018-06-07 22:30:10 +02:00
omar
8c374512fd
Examples, Platform: Removed the call to ImGui::NewFrame() from the platform _NewFrame() function e.g. ImGui_ImplWin32_NewFrame(), ImGui_ImplSDL2_NewFrame(), ImGui_ImplGlfw_NewFrame(), etc. Moved to main.cpp for consistency. ( #1542 )
2018-06-07 22:10:31 +02:00
omar
77d51ebf24
Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.
2018-06-07 19:20:04 +02:00
omar
8e48ab6b19
Nav: Addendum: only set io.WantSetMousePos if necessary. ( #1867 )
2018-06-07 18:08:59 +02:00
