omar
|
7ccbb765e2
|
InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554)
|
7 years ago |
|
omar
|
2f15cc0855
|
Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)
|
7 years ago |
|
omar
|
05885b2e6d
|
Merge fix.
|
7 years ago |
|
omar
|
472ba1394c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
28a76af185
|
Internal: DrawData: Tidying, renaming.
|
7 years ago |
|
omar
|
a77913054f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
1182174d81
|
Internals: DrawData: We don't need an intermediate layer for popups.
|
7 years ago |
|
omar
|
0c06b43e6b
|
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
|
7 years ago |
|
omar
|
038453258e
|
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
|
7 years ago |
|
omar
|
06eef2ce6f
|
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
|
7 years ago |
|
omar
|
6eff21ee5e
|
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)"
This reverts commit 03f5cd6ca1.
|
7 years ago |
|
omar
|
514d30d8cd
|
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
|
7 years ago |
Crunkle
|
daa38f2ad0
|
Fix cross compilers
|
7 years ago |
|
omar
|
db63e71f13
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
7 years ago |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
7 years ago |
|
omar
|
c85d7d6e49
|
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
|
7 years ago |
|
omar
|
c9be7d7254
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
0a98202714
|
Nav: Standardized FIXME-NAV marker.
|
7 years ago |
|
omar
|
cc173d7619
|
Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
7 years ago |
|
omar
|
5e9ae92ae9
|
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
7 years ago |
|
omar
|
f7b10fc954
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
6a1011cf53
|
MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
7 years ago |
|
omar
|
b74f24c3e5
|
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)"
This reverts commit 651538e13b.
|
7 years ago |
|
omar
|
1c95dea88c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
7d2a068dea
|
Begin: Shuffling bits of code around.
|
7 years ago |
|
omar
|
cd7e178eac
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
651538e13b
|
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
7 years ago |
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
7 years ago |
|
omar
|
67671c0ab5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
1eee10778b
|
Internals: Begin: Refactor some code into an UpdateManualResize() function.
|
7 years ago |
|
omar
|
483f9b0d07
|
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
|
7 years ago |
|
omar
|
03f5cd6ca1
|
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)
|
7 years ago |
|
omar
|
919fc548ad
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
6c583315e6
|
Begin: Moving some code around for the benefits of the wip viewport branch.
|
7 years ago |
|
omar
|
f610e25682
|
Internals: Using ImFloor().when appropriate.
|
7 years ago |
|
omar
|
fe919995da
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
933ee6cd5d
|
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541)
|
7 years ago |
|
omar
|
fd4d63a0c5
|
InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541)
|
7 years ago |
|
omar
|
168200f915
|
Popups: Comments, reorganize bits of the header section, renamed parameters.
|
7 years ago |
|
omar
|
a8e5542d78
|
BeginPopup: Exposed extra_flags publicly. (#1533)
|
7 years ago |
|
omar
|
3f4eccf154
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
3fc7cf190d
|
OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533)
|
7 years ago |
|
omar
|
deab2ab015
|
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
|
7 years ago |
|
omar
|
69ff65f054
|
Internals: Popup: Renaming fields.
|
7 years ago |
|
omar
|
3678307cd9
|
Popup, Menus: Tweaks and comments.
|
7 years ago |
|
omar
|
369189b675
|
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
|
7 years ago |
|
omar
|
e09852fc49
|
Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
|
7 years ago |
|
omar
|
63e4677b81
|
Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
|
7 years ago |
|
omar
|
c337cdcfd3
|
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
|
7 years ago |
|
omar
|
7ad169fa09
|
Merge branch 'master' into navigation + fix previous merge
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
d730a763f6
|
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
|
7 years ago |
|
omar
|
66b2ee6ea2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
a34490239c
|
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
|
7 years ago |
|
omar
|
5fd19f037f
|
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
|
7 years ago |
|
omar
|
2874aabb93
|
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
|
7 years ago |
|
omar
|
95b773370f
|
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9.
|
7 years ago |
|
omar
|
007f4034c9
|
Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
|
7 years ago |
|
omar
|
29c194b2a4
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
4fc9f44073
|
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
|
7 years ago |
|
omar
|
4b1240b2e1
|
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
|
7 years ago |
|
omar
|
b2ec0741f1
|
Internals: Settings api tweaks
|
7 years ago |
|
omar
|
2b8224692e
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
0a0b252bb6
|
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
|
7 years ago |
|
omar
|
33f7769d85
|
Columns: Clear offsets data when columns count changed. (#1525)
|
7 years ago |
|
omar
|
f9b2058d5a
|
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
|
7 years ago |
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
7 years ago |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
7 years ago |
|
omar
|
7fcbd45500
|
Internals: NextWindow: Renamed, moved functions to member.
|
7 years ago |
|
omar
|
e339949de1
|
Internals: NextWindow: Using ImGuiCond for consistency.
|
7 years ago |
|
omar
|
04b44398eb
|
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
|
7 years ago |
|
omar
|
7e03ee8d85
|
Merge branch 'master' into navigation
|
7 years ago |
Cory McWilliams
|
561e9f286e
|
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
|
7 years ago |
|
omar
|
170bcb2d7c
|
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
|
7 years ago |
|
omar
|
7a15fc8de5
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
2dd2ca0096
|
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e.
|
7 years ago |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
4fbdb50dca
|
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
|
7 years ago |
|
omar
|
4ba2e85744
|
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
|
7 years ago |
|
omar
|
90ff4ae5d1
|
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
|
7 years ago |
|
omar
|
e985baa35d
|
Combo: When peeking into the popup window for alignment we check if the window was active, which is more correct. (no known issue in current codebase, but we'll need that change for later)
|
7 years ago |
|
omar
|
06bea369c0
|
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
|
7 years ago |
|
omar
|
563d04fdb1
|
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. (#143, #581)
|
7 years ago |
|
omar
|
49eed6e2d1
|
Version 1.54 WIP
|
7 years ago |
|
omar
|
436cad4bca
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
d9034bf2d8
|
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. (#931)
|
7 years ago |
|
omar
|
e916310b2e
|
Version 1.53
|
7 years ago |
|
omar
|
ed2105d4a2
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
3849bb4470
|
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
|
7 years ago |
|
omar
|
de5c304b49
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
8d54b1b7af
|
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
|
7 years ago |
|
omar
|
1b86e7343f
|
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
|
7 years ago |
|
omar
|
cead207535
|
Comments
|
7 years ago |
|
omar
|
6c63c7a8b1
|
Various zealous warning fixes (thanks Clang). (Navigation branch)
|
7 years ago |
|
omar
|
ffb4f6ca8c
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
9cda86d55a
|
Internals: Added IM_NEW, IM_DELETE helper macros (#1517, #484, #504)
|
7 years ago |
|
omar
|
983d8f5f8e
|
Various zealous warning fixes (Clang).
|
7 years ago |
|
omar
|
53b24ff79a
|
Removed reliance on ImU64 type for the ImDrawList assert. (#1184)
|
7 years ago |
|
omar
|
1f26652944
|
Various zealous warning fixes (thanks Clang).
|
7 years ago |
|
omar
|
1c1e490316
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
46dcd9aa50
|
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() (#125)
|
7 years ago |
|
omar
|
471bcf8b5e
|
Columns: Fixed dragging when using a same of columns multiple times in the frame. (#125)
|
7 years ago |
|
omar
|
e1a103b251
|
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. (#143)
|
7 years ago |
|
omar
|
8d21ee56d2
|
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 (#1519)
|
7 years ago |
|
omar
|
287380261c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
7 years ago |
|
omar
|
c8c872c753
|
Internals: String functions uses size_t in their signature
|
7 years ago |
|
omar
|
996dfb21cf
|
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
|
7 years ago |
|
omar
|
d139bd088d
|
Begin: Moved modal darkening draw block
|
7 years ago |
|
omar
|
14cb8177d0
|
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
|
7 years ago |
|
omar
|
531c11d5c7
|
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
|
7 years ago |
|
omar
|
230f826ef5
|
ImDrawList: Comments
|
7 years ago |
|
omar
|
4c2514dc29
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
6193f46af2
|
Active Modal window always set the WantCaptureKeyboard flag (#744)
|
7 years ago |
|
omar
|
b366dd9322
|
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
|
7 years ago |
|
omar
|
55c0d2b9ab
|
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo (#1506, #1508)
|
7 years ago |
ibachar
|
abaf347deb
|
Added a flag for text input to disable undo / redo
|
7 years ago |
|
omar
|
b1d90b565d
|
Columns: Fixed previous commit (wrong chunk commited) (#125)
|
7 years ago |
|
omar
|
b9391d1692
|
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. (#125)
|
7 years ago |
|
omar
|
6497f5dc1b
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
0c6e260f73
|
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES (#143)
|
7 years ago |
|
omar
|
6effcf21d6
|
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. (#143)
|
7 years ago |
|
omar
|
51433e26af
|
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip (#143)
|
7 years ago |
|
omar
|
eefea0588a
|
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. (#1380, #1502)
|
7 years ago |
Branimir Karadžić
|
ac8e708c3e
|
Fixed unused variable warning.
|
7 years ago |
|
omar
|
45bca7851d
|
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. (#1382)
|
7 years ago |
|
omar
|
cc3192f347
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
7 years ago |
|
omar
|
f265e16b84
|
Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
This reverts commit 7ac1583411.
|
7 years ago |
|
omar
|
ddbcda8c1b
|
Columns: Column width data is no longer lost while dragging toward the right side. (#1499, #125)
|
7 years ago |
|
omar
|
ba71e1c0e4
|
Columns: Minor stylistic fixes. (#125)
|
7 years ago |
|
omar
|
f7c5f420e7
|
BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. (#1500)
|
7 years ago |
|
omar
|
e8e84a6ad6
|
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. (#125)
|
7 years ago |
|
omar
|
4ae5c7e227
|
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. (#125, #1499)
|
7 years ago |
|
omar
|
b016215c80
|
Columns: Refactor: Not using statestorage lookup anymore. (#125, #1499)
|
7 years ago |
|
omar
|
3a31a75e3b
|
Columns: Refactor: Renamed all members. (#125, #1499)
|
7 years ago |
|
omar
|
78320aa633
|
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. (#125, #1499)
|
7 years ago |
|
omar
|
027ffd91ea
|
IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
|
7 years ago |
|
omar
|
16fb58984f
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
90d0b8b58b
|
Navigation: minor sync to reduce drifts between changes
|
7 years ago |
|
omar
|
8b59ed0708
|
Drag and Drop: Exposed some internals.
|
7 years ago |
|
omar
|
7c7a7baf76
|
Merged miscellaneous small stuff (from nav/dock branches).
|
7 years ago |
|
omar
|
b174fcc9af
|
Added IsAnyWindowFocused() (from Nav branch).
|
7 years ago |
|
omar
|
fa9327ccf8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
7 years ago |
|
omar
|
d0a1be0de0
|
Merge branch 'drag_and_drop'
|
7 years ago |
|
omar
|
ab049c6fc0
|
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
7 years ago |
|
omar
|
7faa5b16bb
|
Tweak
|
7 years ago |
|
omar
|
3ea5e67ba2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
7 years ago |
|
omar
|
02e0a078f4
|
Begin: Tidying up code to make it more readable.
|
7 years ago |
|
omar
|
28bbf1ade6
|
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
|
7 years ago |
|
omar
|
d561a43a4d
|
Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. (#143)
|
7 years ago |
|
omar
|
e98df91dc4
|
Drag and Drop: Added ImGuiCol_DragDropTarget (#143, #707)
|
7 years ago |