omar
|
04022114d9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
f242cd4d8a
|
Fixed GCC mem-access warnings (#2565)
+ using "if defined" more consistently for Clang.
|
6 years ago |
|
omar
|
4158cba1ff
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
632469d2e5
|
Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.
|
6 years ago |
|
omar
|
7355c84701
|
Tweak EndGroup() to facilitate fixing #2550 later (currently should have no side-effect0. Demo: Add extra widget to status query test.
|
6 years ago |
|
omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
6 years ago |
|
omar
|
e29176df53
|
Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.
|
6 years ago |
|
omar
|
42fc563fed
|
Version 1.71 WIP + fixed minor typo
|
6 years ago |
|
omar
|
d1d5075b66
|
Version 1.70
|
6 years ago |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
86f92fe756
|
Demo: Improved trees in columns demo. (#2136)
|
6 years ago |
|
omar
|
825b61e4ba
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
3fbc0b7a9e
|
Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.
|
6 years ago |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
0f2852806c
|
Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. (#2518)
|
6 years ago |
Richard Mitton
|
4c0f34fd5d
|
Improved algorithm for mitre joints on thick lines
|
6 years ago |
|
omar
|
842a720e72
|
Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's ae76a1fd).
|
6 years ago |
|
omar
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
6 years ago |
|
omar
|
6db0766564
|
Misc comments, internal renaming, added disable indentation option to Columns demo section.
|
6 years ago |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
5078fa208b
|
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
|
6 years ago |
|
omar
|
8d53f834ee
|
Demo: Documents: Fix misusage of ListBoxHeader().
|
6 years ago |
|
omar
|
1aeee9d40f
|
Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows.
Renamed SameLine() first parameter.
|
6 years ago |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
742b5f4c68
|
Merged a bunch of small changes from Docking branch to reduce the difference between branches.
Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.
|
6 years ago |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
ee02cdbf03
|
Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)
|
6 years ago |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
570d0bbbda
|
Demo: Comments, tweaks, removed some uses of ImColor helpers.
|
6 years ago |
|
omar
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
6 years ago |
|
omar
|
4a57507f75
|
InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336)
Not using isprint. + todo items.
|
6 years ago |
|
omar
|
3a737e665a
|
Examples: Vulkan: Added missing support for 32-bit indices (#define ImDrawIdx unsigned int). + demo typo
|
6 years ago |
|
omar
|
8d4b5fef1d
|
Renamed ImGuiDockNodeFlags_Dockspace to ImGuiDockNodeFlags_DockSpace for consistency. DockBuilderCopyDockspace() to DockBuilderCopyDockSpace(). Made casing consistent elsewhere. (#2109)
|
6 years ago |
|
omar
|
04a9ce3a18
|
Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109)
|
6 years ago |
|
omar
|
f208fd7ebb
|
Docking: Fixed crash with ImGuiDockNodeFlags_AutoHideTabBar flag. (#2423, #2109)
|
6 years ago |
|
omar
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
d9f6ba3035
|
IsWindowHovered() made change which should have no effect in master but fix result of IsWindowHovered(ImGuiHoveredFlags_ChildWindows) over multiple viewport in docking branch. (#2432)
|
6 years ago |
|
omar
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
6 years ago |
|
omar
|
857381b9ca
|
GetMouseDragDelta(): also returns the delta on the mouse button released frame. Verify that mouse positions are valid otherwise returns zero. Removed obsolete comment. Tweaked demo. (#2419)
|
6 years ago |
|
omar
|
ff03ae503b
|
Examples: OpenGL: Added a dummy GL call + comments in ImGui_ImplOpenGL3_Init() to detect uninitialized GL function loaders early, and help users understand what they are missing. (#2421)
|
6 years ago |
|
omar
|
cf2c52282d
|
Version 1.70 WIP
|
6 years ago |
|
omar
|
ebe79bbed0
|
Demo: Custom rendering: Minor sizing issue fix.
|
6 years ago |
|
omar
|
b1af4d36ce
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |
|
omar
|
55c02099c5
|
Version 1.69, comments, typos
|
6 years ago |
|
omar
|
9afb849e16
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
495065f790
|
Fixed Clang and PVS warnings.
|
6 years ago |
|
omar
|
897badec7a
|
Demo: InputText: Demonstrating use of ImGuiInputTextFlags_CallbackResize. (#2006, #1443, #1008).
|
6 years ago |
|
omar
|
f7db4fad31
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
3eedb542a6
|
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
|
6 years ago |
Haldean Brown
|
79bb4ce128
|
Added ImGuiColorEditFlagsFlags_InputHSV. (#2383, #2384)
|
6 years ago |