omar
|
44174b1fa1
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
|
2020-01-14 20:01:27 +01:00 |
|
omar
|
4f7bf7e96a
|
Backends: Win32: Added support for #define IMGUI_IMPL_WIN32_DISABLE_GAMEPAD and IMGUI_IMPL_WIN32_DISABLE_LINKING_XINPUT. (#2716)
|
2020-01-14 14:58:36 +01:00 |
|
omar
|
f56962cb9a
|
ColorEdit: "Copy As" context-menu tool shows hex values with a '#' prefix instead of '0x' + both with/without alpha when available.
|
2020-01-13 14:09:42 +01:00 |
|
omar
|
ff5299e0e0
|
Docs: FAQ, Comments.
|
2020-01-12 22:09:18 +01:00 |
|
Rokas Kupstys
|
f03c00bc89
|
Added imgui_single_file.h, We use this to validate compiling all *.cpp in same compilation unit.
Removed Unity builds stuff from example_null/. CI builds a temporary .cpp file.
|
2020-01-10 19:04:35 +01:00 |
|
Rokas Kupstys
|
97a8dc6514
|
CI: Added PVS-Studio static analysis on the continuous-integration server.
|
2020-01-10 16:58:39 +01:00 |
|
omar
|
861f786d81
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-01-10 14:38:09 +01:00 |
|
omar
|
1db78b8ca7
|
Renaming + missing initialization + missing Changelog update.
|
2020-01-07 21:26:16 +01:00 |
|
Rokas Kupstys
|
5e2329b98e
|
Backends: GL3: Implement glbinding opengl loader support. (#2870)
|
2020-01-07 21:06:37 +01:00 |
|
Rokas Kupstys
|
e254167afd
|
ColorEdit: Fix label alignment when using ImGuiColorEditFlags_NoInputs. (#2955)
|
2020-01-06 16:26:14 +01:00 |
|
omar
|
c706ff6f3a
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2019-12-18 20:49:41 +01:00 |
|
omar
|
0f7105e156
|
Backends: SDL: Wayland: Use SDL_GetMouseState (amend 78ff147 ) (#2800, 2802)
|
2019-12-17 14:35:45 +01:00 |
|
omar
|
9d444062f9
|
Limiting Columns()/BeginColumns() api to 64 columns (#125)
While the current code technically supports it, future code may not so we're putting the restriction ahead.
|
2019-12-17 13:25:46 +01:00 |
|
omar
|
992736dc5d
|
Merge branch 'refs/heads/master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2019-12-13 17:06:27 +01:00 |
|
omar
|
43bd80a40d
|
Internals: Breaking: ImRect() default constructor initializes all fields with 0.0f
Instead of (FLT_MAX,FLT_MAX,-FLT_MAX,-FLT_MAX). Previous behavior was designed for adding into a bounding box but rarely relied on and not worth it.
|
2019-12-13 11:56:00 +01:00 |
|
Ben Carter
|
0e74103659
|
ImDrawList: Add AddNgon(), AddNgonFilled() API.
|
2019-12-09 11:23:06 +01:00 |
|
omar
|
f9c26d23de
|
Removed redirecting functions/enums that were marked obsolete in 1.53 (December 2017).
Comments
|
2019-12-08 16:38:27 +01:00 |
|
Ben Carter
|
697f15e339
|
Added PrimUnreserve() API. Obsoleted calling ImDrawList::PrimReserve() with a negative count.
|
2019-12-08 16:06:32 +01:00 |
|
omar
|
f656e7775e
|
Inputs: Added ImGuiMouseButton enum for convenience (e.g. ImGuiMouseButton_Right=1).
We forever guarantee that the existing value will not changes so existing code is free to use 0/1/2.
|
2019-12-06 16:29:36 +01:00 |
|
omar
|
7ff13f4ee1
|
Examples: Explicitly adding -DIMGUI_IMPL_OPENGL_LOADER_GL3W to Makefile to match linking settings
(otherwise if another loader such as Glew is accessible, the opengl3 backend might automatically use it). [#2919, #2798]
|
2019-12-06 10:43:27 +01:00 |
|
omar
|
b521cd357d
|
Removed implicit default parameter to IsMouseDragging(int button = 0) to be consistent with other mouse functions.
(none of the other functions have it).
|
2019-12-05 18:33:36 +01:00 |
|
Max Thrun
|
6d9a54a904
|
Examples: Metal: Wrap main event loop body in an @autoreleasepool block to ensure allocations get freed even if underlying system event loop gets paused due to app nap (#2910, #2917)
|
2019-12-05 15:50:33 +01:00 |
|
omar
|
8342e5b91a
|
Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4)
Amend b5cad20d79 , 945a509773
+ unrelated minor typos
|
2019-12-05 15:45:30 +01:00 |
|
omar
|
abaf0256b8
|
Version 1.75 WIP
Added message to font file loading assert.
|
2019-11-28 20:58:16 +01:00 |
|
omar
|
28dd8d7efd
|
Docking: Fixed various conflicts not properly resolved on 813e0c1
New git client confusion.
|
2019-11-27 19:27:44 +01:00 |
|
omar
|
813e0c18e6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-11-26 12:23:43 +01:00 |
|
omar
|
bdce833636
|
Version 1.74
|
2019-11-25 18:38:53 +01:00 |
|
omar
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
2019-11-25 18:29:28 +01:00 |
|
omar
|
bbe0409942
|
Metrics: Show wire-frame mesh and approximate surface area when hovering ImDrawCmd. Amend aeb5795 .
Internals: Added ImTriangleArea()
|
2019-11-25 12:01:04 +01:00 |
|
omar
|
51a02b319c
|
Added IM_UNICODE_CODEPOINT_MAX. Changed specs of ImFontAtlas::AddCustomRectRegular() (breaking change).
|
2019-11-21 14:13:17 +01:00 |
|
omar
|
ca63349eb4
|
Renamed XX-bits -> XX-bit in comments to match what the world appears to be using.
|
2019-11-20 11:58:25 +01:00 |
|
omar
|
ecbedc8c26
|
Tweaks, ammend 93efa54 , rename to IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS (#1038)
|
2019-11-19 21:29:12 +01:00 |
|
omar
|
4e90906b04
|
Added IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS / IMGUI_DISABLE_FILE_FUNCTIONS #2734)
Using in Emscripten example.
|
2019-11-19 21:14:44 +01:00 |
|
omar
|
93efa5415f
|
Renamed IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS to IMGUI_DISABLE_DEFAULT_FORMAT_STRING_FUNCTIONS. (#1038)
Renamed IMGUI_DISABLE_MATH_FUNCTIONS to IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS.
|
2019-11-19 20:53:17 +01:00 |
|
omar
|
a1e43c682a
|
Merge branch 'master' into docking (with fixes)
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-11-15 15:32:36 +01:00 |
|
Tracy Ma
|
8f40020ca6
|
Disable Win32 clipboard and IME functions when build target UWP (#2892, #2895)
|
2019-11-15 12:19:44 +01:00 |
|
omar
|
be05e12e21
|
Misc: Using static_assert() when using C++11, instead of our own construct (avoid zealous Clang warnings).
|
2019-11-14 18:02:18 +01:00 |
|
omar
|
25eee91542
|
Error handling: Assert if user mistakenly calls End() instead of EndChild() on a child window. (#1651)
Internals: Moved some error handling code.
|
2019-11-13 21:51:38 +01:00 |
|
omar
|
6e8e2c0fa9
|
Scrollbar: Fixed an issue where scrollbars wouldn't display on the frame following a frame where all child window contents would be culled.
Demo: Fixed a small bug with scrolling demo.
Metrics: Tweaks.
|
2019-11-08 19:01:54 +01:00 |
|
omar
|
69b5c2f541
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-11-08 15:45:12 +01:00 |
|
omar
|
57dc34f4e8
|
TreeNode: Added IsItemToggledOpen() to explicitly query if item was just open/closed, facilitating interactions with custom multi-selections patterns. (#1896, #1861)
|
2019-11-08 15:30:15 +01:00 |
|
omar
|
011d475532
|
TreeNode: The collapsing arrow accepts click even if modifier keys are being held, facilitating interactions with multi-select patterns. (#2886, #1896, #1861)
|
2019-11-08 15:30:15 +01:00 |
|
omar
|
4c13807b7d
|
Misc: Optimized storage of window settings data (reducing allocation count).
|
2019-11-05 22:43:53 +01:00 |
|
omar
|
3929255b77
|
Examples: Emscripten: Removed BINARYEN_TRAP_MODE=clamp from Makefile which was removed in Emscripten 1.39.0 but required prior to 1.39.0, making life easier for absolutely no-one. (#2877, #2878) [@podsvirov]
|
2019-11-05 12:53:30 +01:00 |
|
omar
|
a704614b3e
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2019-11-04 16:33:57 +01:00 |
|
omar
|
792a8631aa
|
Metrics: Expose basic details of each window key/value state storage.
|
2019-10-31 14:01:35 +01:00 |
|
omar
|
d62a413476
|
Misc: Windows: Do not use _wfopen() if IMGUI_DISABLE_WIN32_FUNCTIONS is defined. (#2815)
|
2019-10-29 21:47:43 +01:00 |
|
omar
|
b3e94f5de8
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
|
2019-10-29 17:21:19 +01:00 |
|
omar
|
f002a11898
|
Backends: OpenGL3: Fix building with pre-3.2 GL bindings which do not expose glDrawElementsBaseVertex(), using runtime GL version to decide if we set ImGuiBackendFlags_RendererHasVtxOffset. (#2866, #2852) [@dpilawa]
|
2019-10-25 11:56:44 +02:00 |
|
omar
|
0cbb96895a
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx12.cpp
# imgui.cpp
# imgui.h
# imgui_widgets.cpp
|
2019-10-24 15:11:37 +02:00 |
|