1eee10778b
Internals: Begin: Refactor some code into an UpdateManualResize() function.
7 years ago
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
03f5cd6ca1
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )
7 years ago
919fc548ad
Merge branch 'master' into navigation
7 years ago
6c583315e6
Begin: Moving some code around for the benefits of the wip viewport branch.
7 years ago
f610e25682
Internals: Using ImFloor().when appropriate.
7 years ago
fe919995da
Merge branch 'master' into navigation
7 years ago
933ee6cd5d
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). ( #1541 )
7 years ago
fd4d63a0c5
InputText: Moved code for checking clipboard shortcut so we can expand on it. ( #1541 )
7 years ago
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
7 years ago
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
7 years ago
3f4eccf154
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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
deab2ab015
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). ( #1497 )
7 years ago
69ff65f054
Internals: Popup: Renaming fields.
7 years ago
3678307cd9
Popup, Menus: Tweaks and comments.
7 years ago
369189b675
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
7 years ago
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
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
c337cdcfd3
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
7 years ago
7ad169fa09
Merge branch 'master' into navigation + fix previous merge
...
# Conflicts:
# imgui.cpp
7 years ago
d730a763f6
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
7 years ago
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
a34490239c
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
7 years ago
5fd19f037f
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
7 years ago
2874aabb93
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
7 years ago
95b773370f
Revert "Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )" Will come up with a better design later.
...
This reverts commit 007f4034c9
7 years ago
007f4034c9
Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )
7 years ago
29c194b2a4
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
4fc9f44073
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
7 years ago
4b1240b2e1
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
7 years ago
b2ec0741f1
Internals: Settings api tweaks
7 years ago
2b8224692e
Merge branch 'master' into navigation
7 years ago
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
33f7769d85
Columns: Clear offsets data when columns count changed. ( #1525 )
7 years ago
f9b2058d5a
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
7 years ago
05ec0b0736
Casing tweaks + clarify license copyright (simpler/safer?) ( #1346 )
7 years ago
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
7 years ago
7fcbd45500
Internals: NextWindow: Renamed, moved functions to member.
7 years ago
e339949de1
Internals: NextWindow: Using ImGuiCond for consistency.
7 years ago
04b44398eb
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
7 years ago
7e03ee8d85
Merge branch 'master' into navigation
7 years ago
561e9f286e
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
7 years ago
170bcb2d7c
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
7 years ago
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
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
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
4fbdb50dca
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
7 years ago
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
7 years ago
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
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
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
7 years ago
563d04fdb1
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. ( #143 , #581 )
7 years ago
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
7 years ago
e916310b2e
Version 1.53
7 years ago
ed2105d4a2
Merge branch 'master' into navigation
7 years ago
3849bb4470
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
7 years ago
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
7 years ago
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
cead207535
Comments
7 years ago
6c63c7a8b1
Various zealous warning fixes (thanks Clang). (Navigation branch)
7 years ago
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
9cda86d55a
Internals: Added IM_NEW, IM_DELETE helper macros ( #1517 , #484 , #504 )
7 years ago
983d8f5f8e
Various zealous warning fixes (Clang).
7 years ago
53b24ff79a
Removed reliance on ImU64 type for the ImDrawList assert. ( #1184 )
7 years ago
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
1c1e490316
Merge branch 'master' into navigation
7 years ago
46dcd9aa50
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() ( #125 )
7 years ago
471bcf8b5e
Columns: Fixed dragging when using a same of columns multiple times in the frame. ( #125 )
7 years ago
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
8d21ee56d2
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 ( #1519 )
7 years ago
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
c8c872c753
Internals: String functions uses size_t in their signature
7 years ago
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
d139bd088d
Begin: Moved modal darkening draw block
7 years ago
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
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
230f826ef5
ImDrawList: Comments
7 years ago
4c2514dc29
Merge branch 'master' into navigation
7 years ago
6193f46af2
Active Modal window always set the WantCaptureKeyboard flag ( #744 )
7 years ago
b366dd9322
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
7 years ago
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
7 years ago
abaf347deb
Added a flag for text input to disable undo / redo
7 years ago
b1d90b565d
Columns: Fixed previous commit (wrong chunk commited) ( #125 )
7 years ago
b9391d1692
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. ( #125 )
7 years ago
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
7 years ago
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
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
7 years ago
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
ac8e708c3e
Fixed unused variable warning.
7 years ago
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
7 years ago
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
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
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. ( #1499 , #125 )
7 years ago
ba71e1c0e4
Columns: Minor stylistic fixes. ( #125 )
7 years ago
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
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
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
b016215c80
Columns: Refactor: Not using statestorage lookup anymore. ( #125 , #1499 )
7 years ago
3a31a75e3b
Columns: Refactor: Renamed all members. ( #125 , #1499 )
7 years ago
78320aa633
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. ( #125 , #1499 )
7 years ago
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
16fb58984f
Merge branch 'master' into navigation
7 years ago
90d0b8b58b
Navigation: minor sync to reduce drifts between changes
7 years ago
8b59ed0708
Drag and Drop: Exposed some internals.
7 years ago
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
7 years ago
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
7 years ago
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
d0a1be0de0
Merge branch 'drag_and_drop'
7 years ago
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
7 years ago
7faa5b16bb
Tweak
7 years ago
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
02e0a078f4
Begin: Tidying up code to make it more readable.
7 years ago
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
7 years ago
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
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
7ec934f439
Drag and Drop: Comments
7 years ago
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
ee7f1921e8
Internals: Added GetSmallSquareSize()
7 years ago
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
7 years ago
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
7 years ago
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
7 years ago
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
7 years ago
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
7 years ago
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
7 years ago
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
7 years ago
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
e3e0326ea9
Exposed BeginCombo() publicly.
7 years ago
eab6333a0b
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ( #1490 )
7 years ago
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
7 years ago
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
7 years ago
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
7 years ago
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
7 years ago
e23083a080
Fixed warning: logical ‘and’ of equal expressions
7 years ago
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
7 years ago
a8c7b1a2a2
ColorEdit4: Made IsItemActive() return true when picker popup is active. ( #1489 )
7 years ago
871a5cecc1
Merge branch 'master' into navigation
7 years ago
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
7 years ago
457011660e
Mouse wheel scrolling doesn't change speed inside Combo box (uses to slow down from 5 to 3) but instead slow down on window that are smaller than the scroll speed.
7 years ago
a263dce2f2
Combo: Cleanup. Removed unrequired uses of the _ComboBox flag (the test in EndChild() is from commit no 1!). We could remove ImGuiWindowFlags_ComboBox soonish.
7 years ago
omar
Cory McWilliams
ibachar
Branimir Karadžić