9824bf1ba1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
d5400d9517
Fixes for pre-C++11 compilers.
...
That said, I think we can consider upgrading requirement to an early VS-friendly subset of C++11. The thing I would like the most from C++11 are forward-declared enum (from VS 2012 onward).
6 years ago
2a67aeaa3d
Visual Studio: calling into _vsnprintf. ( #1085 )
6 years ago
6d78045ff8
Demo: Added extra demo in the Basic Horizontal Layout section. ( #1977 ) + PR guidelines
6 years ago
352695bc57
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
e07f5d4c78
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
6 years ago
23b67e6ff5
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
7b4fbf4301
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. ( #1542 )
6 years ago
0c207b7bc9
Demo: Clarified the use of IsItemHovered()/IsItemActive() right after being in the "Active, Focused, Hovered & Focused Tests" section. This will be of more importance with the introduction of tabs.
6 years ago
ee98a069f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
6 years ago
d3be9185b3
Demo: Fixed spacing from b629f90 change.
6 years ago
73e13a0762
Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
6 years ago
badde9a970
Demo: Spacing.
6 years ago
b30b82835a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
6 years ago
b629f90393
Demo: Re-ordered example app code to match their menu order and forward declaration order + added header to delimitate them.
6 years ago
dd61c4802a
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
6 years ago
c7016c25e8
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
6 years ago
14cef31467
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
6201cad2b4
Examples: Comments, Demo: Log early out, TODO. ( #1553 )
6 years ago
17efd7b3b0
Demo: Added basic Drag and Drop demo. ( #143 , #1931 )
6 years ago
770cba0bd0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
6 years ago
62b3d7c51e
Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. ( #1913 , #1914 )
6 years ago
c38fe6b0e1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
14ceaaf460
ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.
6 years ago
c1d8dee6c5
Version 1.63 WIP
6 years ago
fb0106fad2
Demo: Fixed incorrect response to Begin() returning false in overlay demo (which cannot happen since we don't have a title bar, but that doesn't make it a good behaving demo!).
6 years ago
00418d13e3
Demo: Fixed mismatched TreePush/TreePop in Property Editor, due to incorrect revert in 826d77185e ( #1895 )
6 years ago
ce500f8727
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
6 years ago
1b74e3be02
Version 1.62
6 years ago
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
6 years ago
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.
6 years ago
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 )
6 years ago
be4b8b5615
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
6 years ago
3569d74f98
Demo: Moved test of the Hovered/Active/Focused functions to the Widgets section.
6 years ago
cd455a4600
Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. ( #820 , #956 , #1875 )
6 years ago
c725710c6d
Comments
6 years ago
93b032ea92
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
6 years ago
2bdf0b54a2
Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().
6 years ago
03c8a78f04
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
6 years ago
bf56b6b9a5
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. ( #1826 )
6 years ago
01429e7d16
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
6 years ago
d5c8f404b2
Remove trailing white spaces.
6 years ago
640c056602
TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.
6 years ago
036dce634e
Version 1.62 WIP
6 years ago
b0fb340b57
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
78b28d545f
Version 1.61 + todo additions
6 years ago
d7cc4bc317
Demo: Tweaked custom rendering custom, added a Thickness drag. Clarified use of vertical/horizontal line. Add a single pixel demo (wowow)
6 years ago
3f29ed6fd5
ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.
6 years ago
d53bae4c14
Demo: Fixing build due to using INT_MAX, UINT_MAX, LLONG_MAX, ULLONG_MAX.
6 years ago
8adbf081af
Demo: Renamed "fixed overlay" to "simple overlay" because it's not fixed any more!
6 years ago
omar