omar
|
f906d53f7d
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
0a233a505d
|
imgui-test: Added extra item info callbacks. Using nav_bb for interactions when possible. Comments, Demo tweaks.
|
6 years ago |
|
omar
|
86d3bba157
|
Added ImGuiDockNodeFlags_AutoHideTabBar. (#2109)
|
6 years ago |
|
omar
|
2ccc6d2ed1
|
Docking: Exposing extra flag in Configuration panel. Moved some forgotten Changelog entries at the right place.
|
6 years ago |
|
omar
|
ed240c910b
|
Demo: Fixed "Log" demo not initializing properly, leading to the first line not showing before a Clear. (#2318) [@bluescan]
|
6 years ago |
|
omar
|
8a4422b2fa
|
Fixed CloseCurrentPopup() on a child-menu of a modal incorrectly closing the modal. (#2308)
|
6 years ago |
|
omar
|
13a5f5ba8b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
4e8e177cac
|
Persistently fixing some PVS-Studio static analyzer false positive warnings.
|
6 years ago |
|
omar
|
c3c2cd1e82
|
Fix various XCode and PVS-Studio static analyzer warnings (#2309)
|
6 years ago |
|
omar
|
f94af2f5c5
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
6 years ago |
|
omar
|
f94ba546ba
|
Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)
|
6 years ago |
|
omar
|
b5144e477f
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
6 years ago |
|
omar
|
e9c625a1dc
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
8cbb91261e
|
ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery]
+ Demo tweaks
|
6 years ago |
|
omar
|
32c4e01267
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
6 years ago |
|
omar
|
06aaf23877
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
6 years ago |
|
omar
|
2f9bae140b
|
Docking: Demo: Fixed docking document window into parent window. (#2286)
|
6 years ago |
|
omar
|
8a45c56c2c
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
9391a97fbf
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
|
6 years ago |
|
omar
|
95ee99e6aa
|
Version 1.68 WIP
|
6 years ago |
|
omar
|
515ad62335
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
|
6 years ago |
|
omar
|
73353fad64
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
b8c6e31c2d
|
Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)
|
6 years ago |
|
omar
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
e24674fc0e
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
7a5058e3bf
|
Version 1.67
|
6 years ago |
|
omar
|
6e41745f31
|
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)
|
6 years ago |
|
omar
|
529fccd9c2
|
Merge branch 'viewport' into docking
|
6 years ago |
|
omar
|
4ee4f65c70
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
7e78865613
|
Demo: Fixed bounds of DragFloat in Clipping section to avoid passing zero-sized to InvisibleButton().
|
6 years ago |
|
omar
|
8011197c50
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
c96aaef132
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
f53cd3ee0f
|
Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase.
Demo: Typo.
C98 fix.
|
6 years ago |
|
omar
|
6b32570644
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
5af930f97a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
6 years ago |
|
omar
|
50faccf764
|
Demo: Log: Comments. Using clipper. Not linking with rand() anymore.
|
6 years ago |
|
omar
|
5278da98d2
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
e1ed27aeaa
|
(Breaking change) Reorganized Viewports advanced flags, moved into new io.ConfigViewportsXXX flags. Pay attention that ImGuiConfigFlags_ViewportsDecoration became ConfigViewportsNoDecoeration, so the value is inverted! (#1542)
|
6 years ago |
|
omar
|
c8349d3305
|
Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.
|
6 years ago |
|
omar
|
ce1626a51e
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
6 years ago |
|
omar
|
0d6e3ab2b0
|
Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
|
6 years ago |
|
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
e194219f2e
|
Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109)
|
6 years ago |
|
omar
|
c738f9ef92
|
InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257)
|
6 years ago |
|
omar
|
e043b89814
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.h
|
6 years ago |
|
omar
|
02501f07c3
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
6890e08bc5
|
Fixed using SetNextWindowPos() on a child window (which wasn't really documented) position the cursor as expected in the parent window, so there is no mismatch between the layout in parent and the position of the child window. Demo tweak and adding some child window stuff
|
6 years ago |
|
omar
|
84d1ce3958
|
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
|
6 years ago |