omar
|
f2aa124eb8
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
6 years ago |
|
omar
|
92edb7a4e3
|
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
|
6 years ago |
|
omar
|
f9634feb66
|
Internals: Merged some changes to facilitate 1D->2D transition for some elements, and merging the stack layout PR (#846)
|
6 years ago |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
06e917f135
|
Internals: Renaming of non-user facing parts from ValueChanged to Edited terminology. (#2034, #820, #956, #1875)
|
6 years ago |
|
omar
|
abaa274592
|
Internals: Wired a ImGuiItemStatusFlags_ValueChanged into ItemStatusFlags, for an hypothetical IsItemValueChanged() function. (#2034)
|
6 years ago |
|
omar
|
102d5e6de6
|
Rearrange header comments to find enums easily + fixed inconsistent sorting.
|
6 years ago |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
|
omar
|
2dc5ec95d7
|
Internals: InputText: Renaming. Comments.
|
6 years ago |
|
omar
|
9f393c38e9
|
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
|
6 years ago |
|
omar
|
24ff259816
|
InputText: Added support for buffer size/capacity changes via the ImGuiInputTextFlags_CallbackResize flag. (#2006, #1443, #1008).
|
6 years ago |
|
omar
|
4de6e1f7e4
|
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
|
6 years ago |
|
omar
|
4910629f6a
|
Internals: Moved code out of SliderBehaviorT to reduce code bloat and also because caller may have use for the grab_bb for styling purposes.
|
6 years ago |
|
omar
|
9d7480774f
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
bb2de30e3e
|
Internals: Added ImTextCountUtf8BytesFromChar() helper.
|
6 years ago |
|
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).
|
6 years ago |
|
omar
|
4e33aeed82
|
Selectable: Added ImGuiSelectableFlags_Disabled flag in the public API. (#211)
|
6 years ago |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
d4cd121ae1
|
TODO + added missing _None enum for some internals flags.
|
6 years ago |
|
omar
|
fda9dc8e18
|
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. (#2013)
|
6 years ago |
|
omar
|
0905202f44
|
Internals: Minor renaming for consistency.
|
6 years ago |
|
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
|
6 years ago |
|
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!)
|
6 years ago |
|
omar
|
9824bf1ba1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
a7ac9e8346
|
Made assertion more clear when trying to call Begin() outside of the NewFrame()..EndFrame() scope. (#1987)
|
6 years ago |
|
omar
|
4d5dcdb57a
|
Internals: Changed signature of ShadeVerts functions to remove pointers. (#1286, #1700, #1986)
|
6 years ago |
|
omar
|
0095b7a0ea
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
28c1a9857e
|
Internals: Changed SplitterBehavior() signature to be consistent with other similar signatures. (#319).
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
6b4f6cd2c5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
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.
|
6 years ago |
|
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
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
0c88fad6c2
|
Internals: SplitterBehavior() added hover_visibility_delay parameter which is helpful to reduce visual noise. (#319)
|
6 years ago |
|
omar
|
f22024cb19
|
Internals: Exposed NavScoreItemGetQuadrant() as ImGetDirQuadrantFromDelta() in imgui_internal.h
|
6 years ago |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
3a522b2400
|
Internals: Renamed one of the arrow functions so their name don't collide.
|
6 years ago |
|
omar
|
e07f5d4c78
|
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
|
6 years ago |
|
omar
|
7b4fbf4301
|
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542)
|
6 years ago |
|
omar
|
b8b74970d7
|
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542)
|
6 years ago |
|
omar
|
b30b82835a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
6 years ago |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
9007dff5eb
|
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211)
+ shallow changelog tweaks
|
6 years ago |
|
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.
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
574185426c
|
Internals: Misc/shallow merge from Docking branch.
|
6 years ago |
|
omar
|
7033b2043b
|
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
|
6 years ago |
|
omar
|
dd61c4802a
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
6 years ago |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
6 years ago |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
0708f91617
|
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
64938178b7
|
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
|
6 years ago |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
93950b8c32
|
Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code.
|
6 years ago |
|
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
|
6 years ago |
|
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)
|
6 years ago |
|
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
|
6 years ago |
|
omar
|
c38fe6b0e1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
79153cf19f
|
Internals: Various renaming. e.g. NewFrameUpdateHoveredWindowAndCaptureFlags() to UpdateHoveredWindowAndCaptureFlags() + exposed UpdateMovingWindow() in imgui_internal.h.
|
6 years ago |
|
omar
|
14ceaaf460
|
ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.
|
6 years ago |
|
omar
|
c1d8dee6c5
|
Version 1.63 WIP
|
6 years ago |
|
omar
|
ce500f8727
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
|
6 years ago |
|
omar
|
1b74e3be02
|
Version 1.62
|
6 years ago |
|
omar
|
70b0bd13aa
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
d57fc7fb97
|
Added IsItemDeactivatedAfterChange() if the last item was active previously, isn't anymore, and during its active state modified a value. Note that you may still get false positive. (#820, #956, #1875)
|
6 years ago |
|
omar
|
be4b8b5615
|
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
|
6 years ago |
|
omar
|
cd455a4600
|
Added IsItemDeactivated() to query if the last item was active previously but isn't anymore. Useful for Undo/Redo patterns. (#820, #956, #1875)
|
6 years ago |
|
omar
|
c725710c6d
|
Comments
|
6 years ago |
|
omar
|
93b032ea92
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
6d98c0323b
|
Nav: Added support for PageUp/PageDown (explorer-style: first aim at bottom/top most item, when scroll a page worth of contents). (#787)
|
6 years ago |
|
omar
|
5a7e98c7cf
|
Internals: Nav: Removed ParentID from move result (unused, would need to be full-filled for PageUp/PageDown code) + FAQ typo fix.
|
6 years ago |
|
omar
|
08e20ae465
|
Internals: Reintroducing LastActiveIdTimer because it is useful and to reduce merge conflicts. (#1537)
|
6 years ago |
|
omar
|
d4b151076c
|
Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666fb9. (#1739, #143).
|
6 years ago |
|
omar
|
92b7d6bc4f
|
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143)
|
6 years ago |
|
omar
|
01429e7d16
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
6 years ago |
|
omar
|
ede5059e69
|
Internals: Forward declaring and commenting internal structures. Renamed ImGuiDrawContext to ImGuiWindowTempData, but kept .DC member name for backward compatibility purpose
|
6 years ago |
|
omar
|
86f8cdbd98
|
Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.
|
6 years ago |
|
omar
|
99ff6fc7e4
|
Nav: Draft internal api to forward move request with loop/wrap options. Will rework for parallel scoring of two paths (as a generalization of the NavFlattened concept). (#787)
|
6 years ago |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
6 years ago |
|
omar
|
b0fb340b57
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
6 years ago |
|
omar
|
725c13ca68
|
Fix for atof with glibc.
|
6 years ago |
|
omar
|
2a2bb8970d
|
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
|
6 years ago |
|
omar
|
ff033f431b
|
Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.
|
6 years ago |
|
omar
|
85f3ba844c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
fc7fc83f9e
|
Data types: DragScalar, InputScalar: default parameters. Added IM_STATIC_ASSERT(). Comments.
|
6 years ago |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
7 years ago |
|
omar
|
773d484009
|
Internals: Made ContentsRegionRect absolute to reduce confusion. Renamed InnerRect to InnerMainRect, renamed WindowRectClipper to OuterRectClipped.
|
7 years ago |
|
omar
|
f83f566530
|
Internals: Nav: Extracted code into a NavClampToVisibleAreaForMoveDir() + fix debug code + inline some functions, removed obsolete EndChild() comment.
|
7 years ago |
|
omar
|
5f464877ed
|
Internals: Declaring DragBehavior, SliderBehavior in there (no warantee given) as they may be useful to custom widgets.
|
7 years ago |
|
omar
|
8da0d42ef2
|
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType (#320, #643, #708, #1011)
|
7 years ago |
|
omar
|
4ff23d3306
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
7 years ago |