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
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
2019-01-20 17:56:17 +01:00 |
|
omar
|
f94ba546ba
|
Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)
|
2019-01-20 17:46:00 +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
|
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
|
2019-01-16 17:47:49 +01:00 |
|
omar
|
32c4e01267
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
2019-01-16 16:13:23 +01:00 |
|
omar
|
06aaf23877
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
2019-01-16 16:10:51 +01:00 |
|
omar
|
2f9bae140b
|
Docking: Demo: Fixed docking document window into parent window. (#2286)
|
2019-01-16 14:43:27 +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
|
95ee99e6aa
|
Version 1.68 WIP
|
2019-01-15 20:19:05 +01:00 |
|
omar
|
515ad62335
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
|
2019-01-15 15:14:16 +01:00 |
|
omar
|
73353fad64
|
Merge branch 'master' into viewport
|
2019-01-15 15:13:29 +01:00 |
|
omar
|
b8c6e31c2d
|
Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)
|
2019-01-15 15:05:56 +01:00 |
|
omar
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
2019-01-14 21:30:07 +01:00 |
|
omar
|
e24674fc0e
|
Merge branch 'master' into viewport
|
2019-01-14 21:30:01 +01:00 |
|
omar
|
7a5058e3bf
|
Version 1.67
|
2019-01-14 17:41:44 +01:00 |
|
omar
|
6e41745f31
|
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)
|
2019-01-13 18:57:46 +01:00 |
|
omar
|
529fccd9c2
|
Merge branch 'viewport' into docking
|
2019-01-13 14:19:40 +01:00 |
|
omar
|
4ee4f65c70
|
Merge branch 'master' into viewport
|
2019-01-13 14:19:31 +01:00 |
|
omar
|
7e78865613
|
Demo: Fixed bounds of DragFloat in Clipping section to avoid passing zero-sized to InvisibleButton().
|
2019-01-12 19:48:07 +01:00 |
|
omar
|
8011197c50
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2019-01-10 16:02:32 +01:00 |
|
omar
|
c96aaef132
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-01-10 16:01:36 +01:00 |
|
omar
|
f53cd3ee0f
|
Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase.
Demo: Typo.
C98 fix.
|
2019-01-08 17:37:07 +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 |
|
omar
|
50faccf764
|
Demo: Log: Comments. Using clipper. Not linking with rand() anymore.
|
2019-01-07 17:33:02 +01:00 |
|
omar
|
5278da98d2
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_demo.cpp
|
2019-01-03 21:40:08 +01:00 |
|
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)
|
2019-01-03 21:33:33 +01:00 |
|
omar
|
c8349d3305
|
Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.
|
2019-01-03 21:28:54 +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
|
0d6e3ab2b0
|
Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
|
2019-01-02 21:28:16 +01:00 |
|
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-01-02 19:00:31 +01:00 |
|
omar
|
e194219f2e
|
Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109)
|
2019-01-02 16:22:44 +01:00 |
|
omar
|
c738f9ef92
|
InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. (#2257)
|
2019-01-02 11:03:56 +01:00 |
|
omar
|
e043b89814
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.h
|
2018-12-20 17:03:21 +01:00 |
|
omar
|
02501f07c3
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-12-20 16:54:32 +01:00 |
|
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
|
2018-12-19 15:19:31 +01:00 |
|
omar
|
84d1ce3958
|
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
|
2018-12-18 16:17:27 +01:00 |
|
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-12-18 15:02:35 +01:00 |
|
omar
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2018-12-14 18:46:24 +01:00 |
|
omar
|
f1c7596409
|
Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.
|
2018-12-14 18:42:22 +01:00 |
|
omar
|
9b09c7597f
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
2018-12-13 19:21:51 +01:00 |
|
omar
|
2a1e903f43
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
2018-12-13 19:20:34 +01:00 |
|
omar
|
8497948ba0
|
Comments, minor tweaks.
|
2018-12-13 19:17:36 +01:00 |
|
omar
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
2018-12-11 19:46:46 +01:00 |
|
omar
|
ccce47c6a2
|
Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.
|
2018-12-11 18:10:43 +01:00 |
|
omar
|
2886e0b6f5
|
Demo: Fix collateral damage of 54a60aa
|
2018-12-11 13:25:29 +01:00 |
|