8ad88f725c
Nav: Minor tidying up. ( #787 )
7 years ago
bed55a41e1
Internals: ImRect: Added IsInverted() helper.
7 years ago
e2654a097b
ImRect: added IsInverted() helper.
7 years ago
ce9d7baaba
Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. ( #787 , #1079 )
7 years ago
68d3e139a7
Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. ( #787 )
7 years ago
950f260a32
Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. ( #787 )
7 years ago
79ff3c2d49
Merge branch 'master' into navigation
7 years ago
07163804df
Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h
7 years ago
fd6d8863f7
Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). ( #787 )
7 years ago
8cc2dbc3bd
Internals: Nav: Extracted code into IsWindowNavFocusable(). ( #787 )
7 years ago
bdd868704f
Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. ( #787 , vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows.
7 years ago
27980d9688
Merge branch 'master' into context
7 years ago
c851b33352
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ( #787 )
7 years ago
c8d8dc7f0a
Nav: Internals: Renamed RootNavWindow to NavRootWindow ( #787 )
7 years ago
72485a5d04
Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. ( #787 ) (+1 squashed commits)
...
+ store window inside result.
7 years ago
1cf38d0334
Internals: Nav: Renamed ImGuiNavForward enum ( #787 )
7 years ago
4654040bcb
Nav: Comments, added enum to clarify NavForward code. ( #787 )
7 years ago
3ded262776
Merge branch 'master' into navigation
7 years ago
04d5783ffd
Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. ( #787 )
7 years ago
f2d5300408
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ( #787 )
7 years ago
8bf0c89c0d
Internals: ImRect::Contains(ImRect&) include boundaries (whereas Contains(ImVec2) should not).
7 years ago
d404b93b6b
Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. ( #787 ) + comments
7 years ago
f3776055d6
Merge branch 'master' into context
7 years ago
28671aa821
Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. ( #787 )
7 years ago
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
7 years ago
db2ba13154
Internals: Exposed SetCurrentFont() in imgui_internal.h
7 years ago
1acb155419
Internals: Moved unnecessary MovingWindowMoveId field.
7 years ago
9edf211c0e
Merge branch 'master' into navigation
7 years ago
5e2aa6185c
Reorganized context handling to be more explicit,
...
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565 , #586 , #992 , #1007 , #1558 )
7 years ago
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ( #939 )
7 years ago
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
c2ffce3e5a
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. ( #143 )
7 years ago
cc15512bfc
InputText: Minor tweak.
7 years ago
a221d253f3
Nav: Comment.
7 years ago
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
28a76af185
Internal: DrawData: Tidying, renaming.
7 years ago
a77913054f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
1182174d81
Internals: DrawData: We don't need an intermediate layer for popups.
7 years ago
038453258e
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
7 years ago
061d8df033
MIssing IMGUI_API for a type with non-inline methods.
7 years ago
06eef2ce6f
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
7 years ago
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
db63e71f13
Internals: Exposed SetCurrentFont() in imgui_internal.h
7 years ago
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
7 years ago
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
c9be7d7254
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
0a98202714
Nav: Standardized FIXME-NAV marker.
7 years ago
16285603f2
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
7 years ago
919fc548ad
Merge branch 'master' into navigation
7 years ago
0cabd81071
Internals: Rect: Added ClipWillFull helper + comments on variations.
7 years ago
92d75c44bc
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
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
a34490239c
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
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
b2ec0741f1
Internals: Settings api tweaks
7 years ago
2b8224692e
Merge branch 'master' into navigation
7 years ago
f9b2058d5a
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
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
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
6ec00a366a
Internals: ImRect: Minor formatting tweaks.
7 years ago
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
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
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
e916310b2e
Version 1.53
7 years ago
67191badc2
Merge branch 'master' into navigation
7 years ago
bb8dfe4a34
Fixed incorrect IM_DELETE macro ( 9cda86d55a) ( #1517 , #484 , #504 )
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
1f26652944
Various zealous warning fixes (thanks Clang).
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
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
4c2514dc29
Merge branch 'master' into navigation
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
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. ( #1499 , #125 )
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
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
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
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
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
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
ee7f1921e8
Internals: Added GetSmallSquareSize()
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
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
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
a6f37287d8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
a5e9392140
Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
7 years ago
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
7 years ago
553b0fcf8f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
45466a8cf9
Internals: BeginCombo() added dummy ImGuiComboFlags.
7 years ago
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
7 years ago
8959c64b33
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
7 years ago
2fc6a82665
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
beda5fc5a0
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
7 years ago
e103fe8c1f
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
7 years ago
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
b9dc0caee3
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
7 years ago
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
16d9fa30b2
Merge branch 'master' into drag_and_drop
7 years ago
c860a0a85c
Internals: ImRect: Added IsFinite() helper.
7 years ago
81cbaef806
Merge branch 'master' into navigation
7 years ago
52e475230f
Settings: Internals: Renaming.
7 years ago
7ae71e4984
Settings: Internals: Added FindSettingsHandler()
7 years ago
35eb5c5c99
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
7 years ago
963259d128
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
7 years ago
63712d5f5c
Merge branch 'master' into drag_and_drop
7 years ago
9191b17218
Merge branch 'master' into navigation
7 years ago
f3ec608c19
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
7 years ago
7e2d0d734c
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
7 years ago
d552cabd15
Settings: Internal renaming of structure and fields names.
7 years ago
4e3c7f1557
Nav: Exposed NavInitWindow() in imgui_internal ( #787 )
7 years ago
7763ab3fcc
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
7 years ago
b618629d99
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
7d09a0ae99
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
7 years ago
68b26b4867
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
302757447a
Internals: Added SplitterBehavior(). ( #319 )
7 years ago
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
7 years ago
8b2d449b16
Add ShadeVertsLinearUV()
7 years ago
92212b17aa
Merge branch 'master' into drag_and_drop
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
4022ada843
Merge branch 'master' into drag_and_drop
7 years ago
6f7b1bf2e1
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
7 years ago
29e0078b66
Internals: Window minor internal renaming + added WindowRounding latch.
7 years ago
834fa52c8e
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. ( #1444 , #125 )
7 years ago
7746dd104c
Merge branch 'master' into drag_and_drop
7 years ago
44c590393c
Merge branch 'master' into navigation
7 years ago
4ad414c8d4
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
7 years ago
7c4be0a000
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
7 years ago
5027311e7f
Drag and drop: Standardizing payload types as defines. ( #143 )
7 years ago
ae060b1d67
Merge branch 'master' into drag_and_drop
7 years ago
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
3e06450d27
Internals: Added ArrowButton() helper.
7 years ago
7908cce25f
Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. ( #143 )
7 years ago
a297cbafdb
Merge branch 'master' into navigation
7 years ago
b6504b8eee
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
7 years ago
aae52522c3
Internals: Remove requirement to define IMGUI_DEFINE_PLACEMENT_NEW ( #1103 )
7 years ago
571b08f315
Internal: FindWindowByName() faster and doesn't touch every windows
7 years ago
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
7 years ago
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
a810619555
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
7 years ago
1d7d8f8574
Merge branch 'master' into drag_and_drop
7 years ago
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
7 years ago
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
7 years ago
acf78da742
Drag and drop: moved to imgui.h
7 years ago
b5f714e9f9
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
7 years ago
c5536e49ef
Drag and drop API experiment
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
9f200d10d5
Version 1.52
7 years ago
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
8dd7648db2
Comments
7 years ago
ccdb58b17e
Internal: Added ImVec4 operators
7 years ago
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
7 years ago
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
7 years ago
c432fcf2bb
Minor renaming.
7 years ago
a6ff14d66e
Exposed IM_ARRAYSIZE() in imgui.h
7 years ago
549f9e3f03
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported ( #211 , #1012 )
7 years ago
d513546325
Merge branch 'master' into navigation
7 years ago
de72e9cc87
Internals: ImLerp() helper for ImVec4
7 years ago
20983773f1
Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ( #787 )
...
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
7 years ago
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
7 years ago
51eed2f257
Merge branch 'master' into navigation
7 years ago
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
7 years ago
d3c2e904d8
Internals: Added ImLinearSweep() helper.
7 years ago
938f1b720f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
370a48c10b
Internals: RenderCollapseTriangle() -> RenderTriangle(), takes a ImGuiDir
7 years ago
a03093b2d4
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
29a652adee
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
a126c702d9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
ef3f87eec5
Internals: ButtonBehavior: made ImGuiButtonFlags_PressedOnClick and ImGuiButtonFlags_PressedOnDoubleClick set the click offset correctly + hold on g.ActiveId so Held state can be reported. Added ImGuiButtonFlags_NoHoldingActiveId flag to disable the later.
7 years ago
1c4af303bf
Internals:Helpers: Added ImSwap(int,int), exposed ImStrncpy().
7 years ago
bf778ebb7e
Checkbox: Using checkmark. MenuItem: Tweaked checkmark, thicker.
7 years ago
78a85ba3fe
Begin: Work toward obsoleting the 5-arguments Begin() overload. Internal BeginEx() becomes the normal public Begin() again! (4)
7 years ago
2739b6ebcd
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
7 years ago
4aa9d2089d
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed size_on_first_use from internal BeginEx(). (2)
7 years ago
55d873875e
Begin: Work toward obsoleting the 5-arguments Begin() overload. (1)
7 years ago
d761825cfb
Nav: Renaming a field + Comments.
7 years ago
c42baf392a
Reluctantly exposed GetActiveID(), GetHoveredID() in imgui_internal because the demo code will need it.
7 years ago
f852b9a52a
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
7 years ago
b667d5a9e7
Nav: Internals: Renamed ImGuiButtonFlags_NoNavOverride to ImGuiButtonFlags_NoNavFocus + fixed a theorically missing test in ButtonBehavior() ( #787 )
7 years ago
0371219222
Nav: Internals: Renamed SetActiveIDNoNav -> SetActiveID() and old SetActiveID() -> SetFocusID(), both functions needs to be called when both are desirabled. ( #787 )
...
May break code relying on imgui_internal.h, relying on nav and not calling ButtonBehavior().
7 years ago
4be967823f
Exposed Scrollbar() in imgui_internal.h and removed a bool arg
7 years ago
7a14d7dfdc
Nav: More consistently drawing a (thin) navigation rectangle hover filled frames such as tree nodes, collapsing header, menus. ( #787 )
7 years ago
69dd895358
Nav: Renaming NavInitDefaultRequest -> NavInitRequest
7 years ago
d2975115cd
Nav: Caching into g.NavAnyRequest to minimize hot path cost (and so we can add many more request sources)
7 years ago
c3105919ba
Nav: Minor tweaks also toward removing processing from ItemAdd()
7 years ago
64ce83b9ed
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
042153d254
Internal: ItemAdd(), IsClippedEx(): removed unnecessary indirection for ID parameter
7 years ago
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
7 years ago
80c4e2fe7b
Nav: Tidying up activation mechanism so that setting NavActivateId can trigger buttons.
7 years ago
2f27b733be
Nav: Fixed uninitialized context variables for sanity.
7 years ago
f2c9bd8d4f
Nav: Fixed uninitialized context variables for sanity.
7 years ago
f326fac64a
Nav: Menus and popups now have move request wrap around vertically (using the move request forward thing added recently). ( #787 )
7 years ago
42ee537be3
Comments
7 years ago
a56b71e866
Nav: Added code to render thin highlight type. ( #787 )
7 years ago
64a51327d3
Nav: Added NavMoveResultParentId internal info to record when the parent/context of a given NavId. Useful for various algorithms (currently looking at range selection stuff) ( #787 )
7 years ago
74da533c93
Nav: Added NavJustNavigatedId internal info to record when we land on a given item after a navigation request, useful for various algorithms (currently looking at range selection stuff) ( #787 )
7 years ago
88a354585a
Nav: It's now possible to navigate sibling of a menu-bar while navigating inside one of their child. If a Left<>Right navigation request fails to find a match we forward the request to the root menu. ( #787 , #126 )
...
Currently the sibling menu is isn't automatically opened, that's still left to it (and even that can be anoying in Windows when the first menu-item is a child menu)
7 years ago
587e637db0
Nav: Taking note that we should aim to remove MenuBarAppending later.
7 years ago
1eaa9d0621
Nav: Fixed uninitialized variable (that had no side-effects due to the code/data flow involved)
7 years ago
8a5a29f0be
Nav: Renamed internal field.
7 years ago
9712a81f85
Nav: Rectangle rectangle stored per window and per layer as well. Makes things simpler, allows enable us to visualize more data.
7 years ago
9737efb2f1
Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. ( #787 )
7 years ago
8a814487fe
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
30b1d85962
Nav: Commiting some better organized Debug helper because this going to stay for a bit.
7 years ago
164f22d5b7
Comments
7 years ago
df366b230e
ColorPicker4: Use nav flag to provide a slighly better experience when using navigation ( #787 , #346 )
7 years ago
2d859dee4e
Nav: Added ImGuiItemFlags_NoNav item flag
7 years ago
4b4e455c40
Nav: Internal nenaming
7 years ago
50ba543743
Comments
7 years ago
e0a2a832cd
Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent ( #787 )
7 years ago
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
926c1cf9a4
Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag
7 years ago
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
7 years ago
d394c7ad0b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
0106dcbd02
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
7 years ago
35f65e05ed
Merge branch 'master' into navigation
7 years ago
fafe65a8fc
Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name.
7 years ago
7bcb1d3816
Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this
7 years ago
cc26db8ec7
Merge branch 'master' into navigation
7 years ago
0adcddac39
IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing.
7 years ago
99c7622a1b
ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().
7 years ago
a2b2e56e8e
Merge branch 'master' into navigation
7 years ago
8374a454da
Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures.
7 years ago
8fd4beddb8
Merge branch 'master' into navigation
7 years ago
072d6d8cb5
ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited)
7 years ago
f1a20ec66d
Merge branch 'master' into navigation
7 years ago
be03882a15
Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars.
7 years ago
69d0d33451
Exposed PushMultiItemsWidths() to imgui_internal.h
7 years ago
7e8069dd23
Merge branch 'master' into navigation
7 years ago
0d56140b4a
BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
...
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
7 years ago
4b82759598
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
...
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
7 years ago
0a5fb24f10
Popups: Exposing a little more of popups internals in imgui_internals.h
7 years ago
44e8d94aba
Merge branch 'master' into navigation
7 years ago
2fcdeb7f12
Remove commas after last item in enumeration.
...
This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions.
7 years ago
66a9d4856c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
cb2775ae54
Internals: ImGuiItemFlags comments
7 years ago
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
7 years ago
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
2169bf6895
Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). ( #1317 )
7 years ago
790605e359
Minor comments + renaming internal fields
7 years ago
e8dbf1c795
Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api.
7 years ago
804ee78731
Added IsWindowAppearing().
7 years ago
ddf41b0398
Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl.
7 years ago
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
2ee1b70652
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
01d4bf299a
Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. ( #1296 , #76 )
7 years ago
7a9ea281be
ImSwap() helper.
7 years ago
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
7 years ago
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
419b22a487
Internals: Split some code out of NewFrame() into an Initialize() function.
7 years ago
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
7 years ago
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
7 years ago
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
141339e4b7
(internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch
7 years ago
2ad2190d47
Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch)
7 years ago
bea06117bb
Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ( #1291 )
7 years ago
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
7 years ago
d5b0d51274
Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
7 years ago
9670fe9ca7
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
6ee317d26d
ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
7 years ago
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
8 years ago
530baee1a7
Removed tabs that slipped through the cracks
8 years ago
067127f113
Columns: Caching columns clipping rectangles ( #125 )
8 years ago
adeaf1cd72
Columns: Moved PushColumnClipRect() to imgui_internal.h
8 years ago
1c83b073c6
Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. ( #519 , #125 , #913 )
8 years ago
7f0063f858
Columns: Added ImGuiColumnsFlags_NoResize flag (internal). ( #913 , #125 )
8 years ago
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
8 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
8 years ago
bf0d9c123e
Merge branch 'master' into navigation
8 years ago
8be7a60f20
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
8 years ago
1086c87767
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
8 years ago
4075cc58e9
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ( #618 )
8 years ago
a85a14370b
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
8 years ago
d2259f65e5
Undo part of 32dbe836d0 to keep the same name for both overloads ( #891 , #799 )
8 years ago
e682362f35
TODO list update, comments
8 years ago
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
8 years ago
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
8 years ago
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
8 years ago
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
8 years ago
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
fb54dce71c
Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
8 years ago
1a26d0bc98
Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
8 years ago
72da4081f8
Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
8 years ago
390188dfa9
Comments about parts of imgui_internal.h that will self-destruct.
8 years ago
fef8aac523
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. ( #346 )
8 years ago
7537dff806
ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code ( #346 )
8 years ago
bfec9c657e
ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. ( #346 )
8 years ago
69dd1ed583
RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). ( #346 )
8 years ago
19c6a9c0e0
ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( ( #346 ) + comments
8 years ago
78a8f798c5
ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) ( #346 )
8 years ago
a8b202782f
ColorPicker,ColorButton: Honor Border/Shadow style settings ( #346 )
8 years ago
15be7e1a71
ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h ( #346 )
8 years ago
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
8 years ago
138a9dbaeb
Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) ( #862 )
8 years ago
85d9c8fb46
Internals: renaming IndexWithinParent to OrderWithinParent
8 years ago
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
8 years ago
12d265fa31
Version 1.51 WIP tag
8 years ago
5e1caaaef3
Version 1.50
8 years ago
2a3c61e5f8
Merge branch 'master' into 2016-07-navigation
8 years ago
92ea8d1131
Merge branch 'master' into 2016-02-colorpicker
8 years ago
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
8 years ago
b6c0227add
Merge branch 'master' into 2016-02-colorpicker
8 years ago
c76be71acf
Merge branch 'master' into 2016-07-navigation
8 years ago
6257b5814a
Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
8 years ago
3028ccc25b
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
f4cf972ea9
Merge branch 'master' into 2016-02-colorpicker
8 years ago
104b381023
Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). ( #917 )
8 years ago
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
8 years ago
1a0e414d3a
Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()).
8 years ago
98e1d500d4
Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery ( #586 )
8 years ago
dd6163241c
Merge branch 'master' into 2016-02-colorpicker
8 years ago
bdb34d1c11
Merge branch 'master' into 2016-07-navigation
8 years ago
1810b3ff38
Added ImGuiCorner enum to clarify some internal code
8 years ago
abaada4224
Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)
8 years ago
404979e48d
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
8 years ago
fea0fcb7c3
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
f2699de242
Fix using IsItemActive() after EndGroup() or any widget using groups ( #840 , #479 )
8 years ago
ed279c0095
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
1b5bbf725b
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
8 years ago
56cdbe434d
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ( #842 )
8 years ago
0f303d363a
Refactor text alignment options to use ImVec2, removed ImGuiAlign ( #842 , #222 )
8 years ago
de9f8944ea
Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
8 years ago
c5b8c6303a
Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ( #842 )
8 years ago
b397fb507e
Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) ( #829 )
8 years ago
ac7826c8a5
ImRect: Added Translate() helper, removed redundant and misleading Reduce()
9 years ago
ea2425ad9a
Nav: Fixed entering child with PadActivate not setting ActiveIdSource to Nav ( #323 )
9 years ago
695ca7bb45
Nav: Tidying up. Comments. ( #323 )
9 years ago
cf16ba6572
Nav: Exposed RenderNavHighlight() in imgui_internal.h to increase discoverability and reordered arguments to be more consistent ( #323 )
9 years ago
996eb080fa
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
9 years ago
8828889d5e
Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup ( #323 )
9 years ago
cbf24c13ca
Merge remote-tracking branch 'origin' into 2016-07-navigation
9 years ago
a7f6ea592f
Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ( #759 )
9 years ago
dcff032429
Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. ( #323 )
9 years ago
e9c881e4de
Nav: fixed using NavMenu/windowing select when no window is already focused + cleanup code ( #323 )
9 years ago
08a28c16ae
Nav: Merge FocusedWindow and NavWindow that were basically duplicate at this point ( #323 )
9 years ago
2545d75c3b
Tidying up, removed two unnecessary window flags from being exposed in imgui.h
9 years ago
b3cba62b80
Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows ( #323 )
9 years ago
f72e2fd1b1
Merge remote-tracking branch 'origin' into 2016-07-navigation
9 years ago
954c890c67
SameLine() with explicit X position is relative to left of group/columns (ref #746 , #125 , #630 )
9 years ago
e2dd48ae65
Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus ( #323 )
9 years ago
04157da291
Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) ( #323 )
9 years ago
4309b8c1ed
Clarifying that MovedWindow* apply to mouse moving only
9 years ago
efc8858328
ImRect: fixed Clip() function being the other way around (INTERNAL API BREAKING CHANGE- wasn't exposed, hoping nobody uses that) + actually fixes the function behavior.
9 years ago
d6ce800a20
Nav: ActiveIdAllowNavMove -> ActiveIdAllowNavDirFlags for more flexibility (nav up/down typically allowed on a single-line text input) ( #323 )
9 years ago
d9d6b0e629
Nav: Renamed private ImGuiNavDir_ enum to use left/right/up/down to be consistent with key enums ( #323 )
9 years ago
b2aaab873d
Nav: collapse button is interactve, allow collapsing, tidying up, resize speed takes account of framebuffer scale ( #323 )
9 years ago
20a0fde012
Tidying up default clipboard handler for non Windows-OS
9 years ago
aeabda5a5f
Navigation: Tap NavMenu to access menu and close buttons, hold to focus/resize ( #323 )
...
Introducing a concept of NavLayer to filter navigable items
9 years ago
175f42420c
Navigation: Can nav-out but not nav-in a window with ImGuiWindowFlags_NoNav flag ( #323 )
9 years ago
a424d6f805
Navigation: Fixed missing initialization (had no side-effect, would be set in Begin) ( #323 )
9 years ago
5cac4926c8
Fixed display of TitleBgActive color on window before a Modal window + modal window availability for navigation ( #323 )
9 years ago
ba43310df1
Navigation: Renaming, shortened some unnecessary long fields names ( #323 )
9 years ago
4bbdaa4e3c
Navigation: Moving NavInitWindow() around and making it static ( #323 )
9 years ago
c2cb2a6928
Gamepad/Keyboard navigation support, initial commit, WIP ( #323 )
9 years ago
0300e73b3f
Comments
9 years ago
2df229d002
Fixed incorrect comment for ParentWindow ( #615 , #604 )
9 years ago
91e1c56da6
Minor bits.
9 years ago
d9e2e688e9
InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. ( #725 )
...
Partial fix, won't stop ids from functioning because of a zombie id.
9 years ago
de61fcc619
Minor bits
9 years ago
1ef7980e17
Merge branch 'master' into 2016-02-colorpicker
9 years ago
c4db79f34b
Member variable name renamed "ID" "Id" for casing consistency
9 years ago
d1c073a199
Comments, tweaks
9 years ago
5d4cf1c3f3
Version 1.50 WIP
9 years ago
adb85d800d
Version 1.49
9 years ago
9a751da136
Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files
9 years ago
3ddb50a925
Merge branch 'master' into 2016-02-colorpicker
9 years ago
45dacbf084
Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect.
...
Relates to horizontal scrollbar, explicit contents size
9 years ago
b7ebeb1610
Added SetNextWindowSizeConstraint() + demo code ( #668 )
9 years ago
102d03a7eb
Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. ( #668 )
...
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
9 years ago
b630cb5b42
ImGuiWindow: Storing ParentWindow ( #615 , #646 )
9 years ago
7b9c0a5c3f
Renamed ImGuiState -> ImGuiContext ( #586 , #269 )
9 years ago
8b428e8c74
Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() ( #586 , #269 )
9 years ago
ce4d731486
Minor comments, tweaks
9 years ago
313d388bba
Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows ( #635 )
9 years ago
89d5026187
Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). ( #625 , #579 )
9 years ago
9733f4fa24
Internal RenderBullet() helper.
9 years ago
547f34cf22
Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516 )
9 years ago
df749e3f13
Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. ( #600 )
...
New flag and declaration makes uses of SetNextTreeNode() functions on
collapsing header more obvious as well (#579 ).
9 years ago
7406d64c64
PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582 )
9 years ago
c5149cd53c
MenuItem(): checkmark render in disabled color when disabled
9 years ago
6bcc31e575
Merge branch 'master' into 2016-02-colorpicker
9 years ago
ea6b615179
Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ( #610 )
9 years ago
41215534d5
Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),
9 years ago
7ce6c18bbe
Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h ( #600 )
9 years ago
ab4a69bcd4
Comments
9 years ago
fc3b8d0a56
Relative order of Child windows creation is preserved during sort ( #595 )
9 years ago
77177c18f0
Merge branch 'master' into 2016-02-colorpicker
9 years ago
1588eda1ac
Version 1.49 WIP
9 years ago
95cbcdca3f
Version 1.48
9 years ago
4c1d4233b2
Merge branch 'master' into 2016-02-colorpicker
9 years ago
d53c308852
Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394
9 years ago
326c4e40f8
Merge branch 'master' into 2016-02-colorpicker
9 years ago
cfbf06e394
Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)
9 years ago
2b7eeba143
Trim trailing spaces
9 years ago
baabe3b62c
Merge branch 'master' into 2016-02-colorpicker
9 years ago
928832a5bc
Various tidying up / comments, moved columns functions declarations, no functional changes
9 years ago
b8fcb4e7e4
Converted tabs to spaces
9 years ago
3f46d9b933
Renamed FindTextDisplayEnd to FindRenderedTextEnd
9 years ago
5bffc85ba6
Exposed FindTextDisplayEnd to imgui_internal.h
9 years ago
459af7683c
Merge branch 'master' into 2016-02-colorpicker
9 years ago
2065cbec4d
Removed extraneous comma for pedantic compilers ( #516 )
9 years ago
b816d05e33
Minor tidying up following ( #516 ) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments
9 years ago
6846873f23
Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master
9 years ago
d45044fe54
CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag ( #533 ) + demo + made code a little less messy
9 years ago
f8fede1d8b
Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346 )
...
Still pretty much experimenting so may break API
9 years ago
339b67c01a
Exposed FindWindowByName() in imgui_internal.h
9 years ago
b329a36d27
Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517 )
9 years ago
a908c109c0
Added flag for selectables to handle double clicks.
9 years ago
7afd62ec57
Tentative fix for GCC/Clang ( #484 , #504 )
9 years ago
595684e08c
Remove dependency on <new> header ( #484 , #504 )
...
(Now expecting something to fail somewhere..)
9 years ago
005b897d7d
ProgressBar() handling of border size + storing border size in window structure ( #503 )
9 years ago
3922988dea
TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label.
...
Removed DisableHideTextAfterDoubleHash hack used by Metrics window.
9 years ago
4e3c6f64c0
Various minor fixes following a pass of cppcheck static analyzer
9 years ago
dc4a07c49a
Fixed various Clang -Weverything warnings
9 years ago
e41568f87f
Version number 1.48 WIP + Update binaries
9 years ago
24d186753e
Version number 1.47
9 years ago
e4cf44e967
Minor rebranding "ImGui" -> "dear imgui" ( #21 )
9 years ago
40ddf8e287
Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h ( #448 )
9 years ago
6102aa1375
BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click ( #439 )
9 years ago
66886405f6
Minor comment ( #439 )
9 years ago
9b6b1bc0f3
Added GetColorU32 helpers (previously internal and misplaced as window->Color())
9 years ago
ecc97bda7d
Added SetItemAllowOverlap() exposed in imgui_internal.h only
9 years ago
9dca2ca960
Comments & spacing
9 years ago
6269859315
Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing.
9 years ago
4ca34a879d
Columns: Fixed bug with indentation within columns, also making code shorter/faster ( #414 , #125 )
9 years ago
807d4ff92c
Columns: minor tidying up while investigating severe issues with indenting within columns ( #414 )
9 years ago
1aac69c937
Columns: tidying up, moving OffsetT to a ImGuiColumnData structure
9 years ago
3102c0c97e
Rename internal ColumnsStartX to IndentX, makes more sense
9 years ago
92c518a420
InputText: Added password mode via ImGuiInputTextFlags_Password ( #237 , #363 , #374 )
9 years ago
4dee8473b5
Fixed a couple of problems found by CppCat code analyzer.
...
* incorrect implementation of ImVec4 operator- which always gives a w value of 0
* boolean formula of ((A && B) || B) can be simplified to just (B)
9 years ago
1a42a3f91b
Refactor internal SliderBehavior() to take flags instead of a bool.
...
Sorry!
9 years ago
3eabad0321
Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers.
...
This is quite a risky change frankly but I'd rather refactor sooner than
later. Hopefully few people are using the internal functions.
9 years ago
5f0db60a57
Version number 1.47 WIP
9 years ago
72dde4d323
Version 1.46
9 years ago
7a61b7dd57
Renamed Window LastFrameDrawn to LastFrameActive, more correct
9 years ago
43ff5a41be
InputText(): always use live input data for display in read-only mode ( fix #360 )
9 years ago
d087671369
HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API.
9 years ago
98465d401b
Silencing inadequate MSVC warnings when exporting as DLL ( #345 )
9 years ago
3b01b0a2f2
Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts ( #335 )
9 years ago
7b1168eb30
Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size
9 years ago
07776595c2
Added missing IMGUI_API definitions in imgui_internal ( fix #326 )
9 years ago
f5fb5f0c1e
Minor tidying, reordering functions/members/initialisation to follow same orders
9 years ago
dafad3903e
Added GetDrawData() alternative to setting a Render function.
9 years ago
965fa3cb16
Version number 1.46 WIP
9 years ago
c9e19f8953
Version number 1.45
9 years ago
71026d3655
Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo ( #246 )
10 years ago
a3cad2ff06
BeginChild() fixed missing rounding for child sizes which leaked into layout
10 years ago
65a191c005
Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc ( #246 )
...
GetCursorPos, SetCursorPos, GetContentRegionMax,
GetWindowContentRegionMin, GetWindowContentRegionMax are now including
the scrolling amount. It PROBABLY shouldn't break anything for you, but
take note that SetCursorPosX(100.0f) puts you at +100 from the starting
x position which may include scrolling, not at +100 from the window left
side.
10 years ago
fc13ae2aa5
Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit ( #246 )
10 years ago
b326c8fd1f
Added GetCurrentWindowRead() for functions that don't write to the window
10 years ago
2d565d4bfb
Style: rename ScrollbarWidth to ScrollbarSize (sorry!)
10 years ago
65fe60f2b2
Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) ( #282 )
10 years ago
ad3c9f620d
Tabs to spaces
10 years ago
b1987d697f
Trim trailing whitespace ( #305 )
10 years ago
425c6cb3a3
Remove CaptureInputCharactersFromApp and minor cleanups ( #305 )
10 years ago
73917115a8
Added flag showing whether the GUI wants text input
...
Conflicts:
imgui.cpp
10 years ago
4ac4d1ac37
ImHash: defaults seed to zero + comment.
10 years ago
97be3428f1
Added GetMousePosOnOpeningCurrentPopup().
10 years ago
42567a9516
ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.
10 years ago
f1f4d68f7f
Prevent imgui_internal.h from being included without imgui.h (piles of errors)
10 years ago
aa3c26fd30
IM_PRINTFARGS takes one argument. Moved pragma outside of .h ( #295 )
10 years ago
b637850260
Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master
10 years ago
14822609bd
Version number 1.45 WIP
10 years ago
947cf3434f
Added printf attribute to printf like text formatting functions
10 years ago
a99ba42a39
Version number 1.44
10 years ago
88a00f77e9
Cleanup - using ImRect more consistently for ImGui-side cliprect data
10 years ago
f1fb62fa6d
Cleanup - shuffle functions around ( #219 )
10 years ago
9b19f8c19d
Merge branch 'master' into 2015-07-cleanup
...
Conflicts:
imgui.cpp
10 years ago
1b0a8f9ac3
Comments
10 years ago
4b29cc9e10
Exposed relevant functions in imgui_internal.h ( #219 )
10 years ago
f63beeae86
Internal version of LogText() -> LogRenderedText() + shallow tidying up
10 years ago
abf823c6f6
Tidying up
10 years ago
7552f48d7b
ImLoadFileToMemory() default parameters
10 years ago
dace68b6fd
Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ( #219 )
10 years ago
omar
thedmd
Bruce Mitchener
Geoffrey Tucker
Kyle Rocha
Nikolay Zapolnov
Jason Wilkins
Borislav Stanimirov
Thomas Pöchtrager