omar
|
9d7480774f
|
Merge branch 'master' into viewport
|
2018-08-17 11:37:03 -07:00 |
|
omar
|
bb2de30e3e
|
Internals: Added ImTextCountUtf8BytesFromChar() helper.
|
2018-08-17 11:33:45 -07:00 |
|
omar
|
ac39c4b2a8
|
SplitterBehavior: Fix for when the sizes are already under the minimum desired size.
|
2018-08-17 11:33:40 -07:00 |
|
omar
|
341ebd961b
|
Fixed assertion when transitioning from an active ID to another within a group, affecting ColorPicker (broken in 1.62). Made ActiveIdIsAlive track the actual ID to avoid incorrect polling in BeginGroup/EndGroup when the ID changes within the group. (#2023, #820, #956, #1875).
|
2018-08-16 13:33:16 -07:00 |
|
omar
|
8972ebae73
|
Metrics: Added io.MetricsActiveAllocations, moving away from the cross-context global counters than we previously used. (#1565, #1599, #586)
|
2018-08-15 16:28:39 -07:00 |
|
omar
|
5d630c930d
|
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). (#1542)
|
2018-08-15 16:15:44 -07:00 |
|
omar
|
9852649e97
|
Viewport: Initial viewport DpiScale only queried on viewport creation. Because AddUpdateViewport() is called repeatedly on MovingWindow or with ImGuiConfigFlags_ViewportsNoMerge, the DpiScale update would break ImGuiConfigFlags_DpiEnableScaleViewports. (#1542)
|
2018-08-14 19:17:33 -07:00 |
|
omar
|
1722a31155
|
Viewport: ImGuiWindowFlags_NoFocusOnAppearing affects viewport accordingly. (#1542)
|
2018-08-14 14:58:19 -07:00 |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-08-13 17:50:48 -07:00 |
|
omar
|
caaa746424
|
Nav: NavWindowingList doesn't save to .ini file. TODO entries.
|
2018-08-13 17:29:20 -07:00 |
|
omar
|
fda9dc8e18
|
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. (#2013)
|
2018-08-09 18:07:49 +02:00 |
|
omar
|
421dc19798
|
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. (#2015)
|
2018-08-09 17:49:48 +02:00 |
|
omar
|
d5793102db
|
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. (#2002, #1873)
|
2018-08-09 17:42:53 +02:00 |
|
omar
|
0065fe16a2
|
Nav: Made CTRL+TAB skip menus + skip the current navigation window if is has the ImGuiWindow_NoNavFocus set. (#787)
While it was previously possible, you won't be able to CTRL-TAB out and immediately back in a window with the ImGuiWindow_NoNavFocus flag.
|
2018-08-08 16:03:13 +02:00 |
|
omar
|
9d8a0374d3
|
Use literals in place of LLONG_MIN, LLONG_MAX ULLONG_MAX if they are not available. Amend 498c0dcb4c. We prefer using the defines if available in limits.h because they somehow tend to work without warnings when enabling strict C++03 compilation. The 3 literals are fallbacks.. (#1926).
|
2018-08-06 13:07:19 +02:00 |
|
omar
|
0905202f44
|
Internals: Minor renaming for consistency.
|
2018-08-05 18:13:24 +02:00 |
|
omar
|
bc6ac8b2ae
|
Metrics: Changed io.MetricsActiveWindows to reflect the number of active windows (!= from visible windows), which is useful for lazy/idle render mechanisms as new windows are typically not visible for one frame.
Metrics: Added io.MetricsRenderWindow to reflect the number of visible windows.
|
2018-08-03 18:12:36 +02:00 |
|
omar
|
498c0dcb4c
|
Using limits.h LLONG_MIN etc. to increase old-compiler compatibility (as ll and ull prefixes were not standard). Not tested much on old compilers, relying on Clang/GCC warnings.
|
2018-08-03 11:41:07 +02:00 |
|
omar
|
8ef0ca9765
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-08-01 12:27:56 +02:00 |
|
omar
|
87e2fea09d
|
Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. (#1427, #1495, #822, #473, #650)
Demo: Exposed flags in Demo.
|
2018-08-01 11:50:57 +02:00 |
|
omar
|
65b46f62ef
|
Fixed PushID() from keeping alive the new ID Stack top value (if a previously active widget shared the ID it would be erroneously kept alive) (drag and drop demo could soft-lock the UI until pressing Escape!)
|
2018-07-31 17:28:18 +02:00 |
|
omar
|
7e1678ff00
|
Drag and Drop: Elapse payload as soon as delivery is made. (#153)
|
2018-07-31 17:28:08 +02:00 |
|
omar
|
c031ea088a
|
Viewport: Fixed an assert on loss of valid mouse position while dragging a tooltip (would happen often when using debugger breakpoint). Not totally sure about best solution, may not be important.
|
2018-07-31 13:46:37 +02:00 |
|
omar
|
faf2c34149
|
Drag and Drop: Added ImGuiDragDropFlags_SourceAutoExpirePayload flag to force payload to expire if the source stops being submitted. (#1725, #143).
|
2018-07-31 13:46:19 +02:00 |
|
omar
|
79ae6d3bf6
|
Drag and Drop: Clear payload buffers more consistently in ClearDragAndDrop() + BeginDragDropTargetCustom() can't succeed with hidden contents. (#143)
|
2018-07-31 13:45:25 +02:00 |
|
omar
|
9824bf1ba1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-07-31 12:12:56 +02:00 |
|
omar
|
e13e5982ff
|
Drag and Drop: Payload stays available and under the mouse if the source stops being submitted, however the tooltip is replaced by "..." + moved FrameScopeActive = false at the bottom of EndFrame() for safety. (#1725)
|
2018-07-31 12:11:18 +02:00 |
|
omar
|
f88bf9cea3
|
InvisibleButton: Added an assert to catch common type of passing zero-sized dimensions. (#1983)
|
2018-07-30 18:48:10 +02:00 |
|
omar
|
a7ac9e8346
|
Made assertion more clear when trying to call Begin() outside of the NewFrame()..EndFrame() scope. (#1987)
|
2018-07-30 18:20:25 +02:00 |
|
omar
|
4d5dcdb57a
|
Internals: Changed signature of ShadeVerts functions to remove pointers. (#1286, #1700, #1986)
|
2018-07-30 17:24:04 +02:00 |
|
omar
|
f05aede098
|
Revert "Assert that fmt != NULL before calling vsnprintf (#1969)"
This reverts commit 84183f5bb6.
|
2018-07-30 16:50:47 +02:00 |
|
omar
|
80db2383d8
|
Speculative va_copy() fix for old versions of GCC/Clang. (cannot repro) (#1085)
|
2018-07-30 16:01:06 +02:00 |
|
omar
|
2a67aeaa3d
|
Visual Studio: calling into _vsnprintf. (#1085)
|
2018-07-30 16:01:06 +02:00 |
|
omar
|
15a93d6fe3
|
Internals: Fixed HoveredIdTimer so it is safe to call SetHoveredId() multiple times without altering the timer.
|
2018-07-30 14:36:33 +02:00 |
|
omar
|
f9e8b5c652
|
CollapseButton: Added hovering highlight + minor consistency tweaks.
|
2018-07-27 13:32:33 +02:00 |
|
omar
|
6211f40f3d
|
Internals: Drag and Drop: default drop preview use a narrower clipping rectangle (no effect here, but other branches uses a narrow clipping rectangle that was too small so this is a fix for it) + Comments
|
2018-07-27 12:39:42 +02:00 |
|
omar
|
0095b7a0ea
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-07-26 23:55:23 +02:00 |
|
omar
|
28c1a9857e
|
Internals: Changed SplitterBehavior() signature to be consistent with other similar signatures. (#319).
|
2018-07-26 23:50:05 +02:00 |
|
omar
|
63df9d6311
|
Internals: Extracted part of Begin into UpdateWindowParentAndRootLinks(). Useful to call to keep state updated immediately (namely useful for docking) + small tidying up of imgui_internal.h
|
2018-07-26 23:49:36 +02:00 |
|
OswaldHurlem
|
84183f5bb6
|
Assert that fmt != NULL before calling vsnprintf (#1969)
In the case of Visual Studio 15.6 + Windows SDK 10.0, vsnprintf() with NULL format string appears to corrupt the stack...
|
2018-07-26 22:26:50 +02:00 |
|
omar
|
6b4f6cd2c5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-26 19:25:55 +02:00 |
|
omar
|
dd0d5debef
|
Internals: Child windows that are clipped or part of a collapsed parent are not marked as collapsed anymore, but just a separate hidden marker set. We distinguish hiding for size measurement vs hiding for other reasons. Cleaned a little the end of Begin.
|
2018-07-26 19:24:27 +02:00 |
|
omar
|
0b045d8de5
|
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
|
2018-07-26 19:03:02 +02:00 |
|
omar
|
1b646a4440
|
Nav: Tweaked CTRL+TAB to hide visual noise on fast switch + fading out screen dimming and highlight to make the experience less harsh
|
2018-07-26 19:01:51 +02:00 |
|
omar
|
7adac4ab3e
|
FAQ update
|
2018-07-26 12:55:40 +02:00 |
|
omar
|
0c88fad6c2
|
Internals: SplitterBehavior() added hover_visibility_delay parameter which is helpful to reduce visual noise. (#319)
|
2018-07-25 16:07:05 +02:00 |
|
omar
|
f22024cb19
|
Internals: Exposed NavScoreItemGetQuadrant() as ImGetDirQuadrantFromDelta() in imgui_internal.h
|
2018-07-24 16:54:29 +02:00 |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-07-24 16:50:49 +02:00 |
|
omar
|
357534e588
|
Made it possible to move a window by dragging from the Collapse button (past the drag threshold). Extracted some code out to a CollapseButton() function.
|
2018-07-24 16:45:11 +02:00 |
|
omar
|
3a522b2400
|
Internals: Renamed one of the arrow functions so their name don't collide.
|
2018-07-24 16:41:17 +02:00 |
|
omar
|
528b50a89f
|
Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. (#1463, #1380, #1502)
|
2018-07-22 19:04:15 +02:00 |
|
omar
|
4b8ce24e46
|
Internals: Extracted part of NewFrame() into a UpdateMouseWheel() function.
|
2018-07-22 18:57:28 +02:00 |
|
omar
|
4ebd442a24
|
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958)
|
2018-07-22 18:53:27 +02:00 |
|
omar
|
e07f5d4c78
|
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
|
2018-07-22 18:46:41 +02:00 |
|
omar
|
74077491ce
|
Viewport: Fixed a situation when the implicit Debug window can hold on a zombie viewport which platform window is not properly destroyed. (#1542)
|
2018-07-22 16:24:06 +02:00 |
|
omar
|
048add5ef2
|
ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. (#1879)
|
2018-07-19 15:22:18 +02:00 |
|
omar
|
23b67e6ff5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-17 19:52:14 +02:00 |
|
omar
|
93321d3280
|
Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. (#787)
|
2018-07-17 19:48:53 +02:00 |
|
Rokas Kupstys
|
7e59eb026b
|
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)
|
2018-07-17 17:17:56 +02:00 |
|
omar
|
7b4fbf4301
|
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542)
|
2018-07-17 16:37:10 +02:00 |
|
omar
|
b8b74970d7
|
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542)
|
2018-07-17 16:04:47 +02:00 |
|
omar
|
defbf1c4b3
|
Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. (#1542)
|
2018-07-17 15:56:02 +02:00 |
|
omar
|
16c6734bcb
|
Viewport: Revert part of 7abf72e, the viewport ownership stealing is problematic. (#1542). Will rework in the context of docking. (+1 squashed commits)
+ Fixed unused prototype warning (left-over from a merge)
|
2018-07-17 15:14:19 +02:00 |
|
omar
|
b30b82835a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2018-07-12 11:48:49 +02:00 |
|
omar
|
d107146687
|
Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48 for viewport branch)
|
2018-07-12 11:19:17 +02:00 |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
2018-07-12 11:08:24 +02:00 |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2018-07-12 10:03:18 +02:00 |
|
omar
|
23288547ec
|
Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939)
|
2018-07-12 09:53:10 +02:00 |
|
omar
|
9007dff5eb
|
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211)
+ shallow changelog tweaks
|
2018-07-10 19:16:57 +02:00 |
|
omar
|
b829671df1
|
Fixed missing value in GetStyleColorName(). (#1939) broken with c7016c2
|
2018-07-10 16:45:54 +02:00 |
|
omar
|
4dfb9ef751
|
Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.
|
2018-07-10 11:16:40 +02:00 |
|
omar
|
ce18371d1b
|
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
|
2018-07-09 21:49:49 +02:00 |
|
omar
|
dc021f1c23
|
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
|
2018-07-09 21:38:37 +02:00 |
|
omar
|
9dea27b273
|
Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking)
|
2018-07-09 21:18:41 +02:00 |
|
omar
|
140ece0aeb
|
Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.
|
2018-07-09 21:18:10 +02:00 |
|
omar
|
7abf72ec78
|
Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. (#1542)
|
2018-07-09 21:13:51 +02:00 |
|
omar
|
17f36038e0
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:10:47 +02:00 |
|
omar
|
574185426c
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:06:46 +02:00 |
|
omar
|
7033b2043b
|
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
|
2018-07-09 20:34:12 +02:00 |
|
omar
|
dd61c4802a
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:22:49 +02:00 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:16:48 +02:00 |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
0708f91617
|
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
|
2018-07-09 16:20:14 +02:00 |
|
omar
|
bd6097ac6f
|
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks.
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
64938178b7
|
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
|
2018-07-08 18:23:12 +02:00 |
|
omar
|
a33f0d1f7f
|
Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143)
|
2018-07-08 16:38:57 +02:00 |
|
vby
|
3a42eb6620
|
Fix missing ImmReleaseContext in default Win32 IME handler (#1932)
|
2018-07-08 15:24:12 +02:00 |
|
omar
|
b0cdfe0ece
|
Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. (#1909)
|
2018-07-08 13:27:16 +02:00 |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-08 13:08:16 +02:00 |
|
omar
|
c790723cfa
|
Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). (#1875, #143)
|
2018-07-08 13:03:39 +02:00 |
|
omar
|
d11d211e5d
|
Allow popup from ignoring the style.WindowMinSize values so short menus are not padded. (#1909) Wider generalization of b16603745c.
|
2018-07-06 18:29:39 +02:00 |
|
omar
|
42bf149ac6
|
Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor io.OptResizeWindowsFromEdges=true to enable the feature globally. (#1495) The feature is not currently enabled by default because it is not satisfying enough.
|
2018-07-06 15:30:21 +02:00 |
|
omar
|
0146f4b456
|
Internals: BeginChildEx tweaks.
|
2018-07-05 09:17:16 +02:00 |
|
omar
|
7b2662d245
|
Examples: Comments, bits of documentation
|
2018-07-04 19:06:28 +02:00 |
|
omar
|
665bd1e140
|
Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body.
|
2018-07-04 10:29:28 +02:00 |
|
omar
|
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
|
2018-07-02 20:13:16 +02:00 |
|
omar
|
004fe8916a
|
Internals: Settings: Simple optimization caching index into the settings buffer, to remove an unnecessary O(N*M) search during saving. (with N=active root windows during the session, M=stored settings which grows over time)
|
2018-06-28 18:42:38 +02:00 |
|
omar
|
b16603745c
|
Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. (#1909)
|
2018-06-28 11:33:03 +02:00 |
|
omar
|
7adae3299e
|
Double-click on resize grip doesn't need to test HoveredWindow (as button has the flattenchild flag anyway) + double-click on title bar verify that we don't have overlapping items to allow contents in title bar. + Comments
|
2018-06-27 17:29:31 +02:00 |
|
omar
|
c38fe6b0e1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-06-26 12:41:36 +02:00 |
|