90ea7e2f2f
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
5 years ago
0738611559
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
5 years ago
dca7c3c629
TestEngine: Added hook to notify test engine of a removed imgui context.
5 years ago
ddabfc3477
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
5 years ago
9418dcb693
Version 1.77
...
+ fix minor clang-tidy warnings which seems reasonable
5 years ago
5628416bd3
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
5 years ago
fed80b9537
Popups: Changed 'int mouse_buttons' to ImGuiPopupFlags. Added ImGuiPopupFlags_NoOpenOverExistingPopup, ImGuiPopupFlags_NoOpenOverItems. Refactored signature of BeginPopupContextWindow().
5 years ago
5acf6d861a
Popups: Added ImGuiPopupFlags type, ImGuiPopupFlags_AnyPopupId and ImGuiPopupFlags_AnyPopupLevel flags for IsPopupOpen().
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
e0ec69d84b
Internals: Added ImageButtonEx() helper to temporarily bypass ID issues ( #2464 , #1390 )
5 years ago
20d61f5f62
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
8ead38c100
Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.
5 years ago
704723744e
Disabled latest overzealous warnings from Clang
5 years ago
37eb89371b
Popups: Internals: Added IsAnyPopupOpen().
5 years ago
d31fe97f74
Popups: Fix an edge case where programatically closing a popup while clicking on its empty space would attempt to focus it and close other popups. ( #2880 )
5 years ago
90c0c0c163
Columns: Lower overhead on column switches and switching to background channel. (second attempt for 9b3ce49)
...
Internals: Bits, comments, added ImRect::ToVec4()
5 years ago
2665288b30
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
16da8e6da6
Revert "Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). ( #125 )"
...
This reverts commit 9b3ce494fd
5 years ago
9b3ce494fd
Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). ( #125 )
...
This change benefits Columns but was primarily made with Tables in mind.
5 years ago
57191fe3d0
Comments about limiting WindowRounding to a reasonable size.
5 years ago
8baa4ccff5
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
41e8837f59
Comments, adding some spacing in ImVec2() constructors.
5 years ago
3b3af6b731
Docking: Fix extraneous function declaration ( #3236 ) + moved some other declarations in imgui_internal to facilitate moving docking code.
5 years ago
e4d8267188
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
5 years ago
1cd32d3afe
Docking: moving small docking context to imgui_internal.h, removed unnecessary indirection, renaming.
5 years ago
476daf9aac
Settings: Added ReadInitFn pre-load handler.
...
(docking branch already has it, so it'll probably conflict with same contents)
5 years ago
a6f4b0fd70
Nav, Menus: Fix vertical wrap-around in menus or popups created with multiple appending calls to BeginMenu()/EndMenu() or BeginPopup/EndPopup(). ( #3223 , #1207 )
...
First call to EndPopup() called NavRequestTryWrapWindow() which performed wrap-around operation while we were not done composing menu. This resulted in navigation wrapping around to first item.
Since wrap-around operation is only valid in last call to EndPopup() and there is no way to know which call is last - this operation is delayed to the end of the frame.
5 years ago
8596f2b0fc
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
4f33dd15c4
Internals: stand-in for large branches to facilitate merging.
5 years ago
5f752a5ba9
Internals: shuffling some sections (2)
5 years ago
f466cfc2ca
Internals: shuffling some sections, added index.
5 years ago
3aa1684129
Comments
5 years ago
574ff0a280
Docking, Settings: Allow reload of settings data at runtime. ( #2573 )
5 years ago
51e568f9dc
Docking: Fix to allow basic reload of non-docking .ini data (following d33021d8) + moved settings blocks
5 years ago
582f4db59b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
5 years ago
d33021d828
Settings: Made it possible to load window .ini data mid-frame. Added clear and post-read handlers. ( #2573 )
5 years ago
b6a04d7750
Settings: Added Clear Settings in Metrics. ( #2188 ) + Preserve last loaded copy in internal buffer used for save (so it can be browsed easily).
5 years ago
0679e05677
Internals: Added code in TempInputScalar() to clamp values, NOT used by stock Drag/Float ( #3209 , #1829 , #946 , #413 )
5 years ago
5116eee108
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
5 years ago
b4dd28ffbb
Style: Added style.TabMinWidthForUnselectedCloseButton settings.
...
Set to 0.0f (default) to always make a close button appear on hover (same as Chrome, VS).
Set to FLT_MAX to only display a close button when selected (merely hovering is not enough).
Set to an intermediary value to toggle behavior based on width (same as Firefox).
5 years ago
7ddc1adefb
Internals: FIxed commented out IMGUI_DEBUG_LOG_xxx macros, added extra. Revert incorrect 103c5edaa.
5 years ago
266dff9bed
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_internal.h
5 years ago
c0283c1289
TestEngine: Changed PushID hooks into GetID(), makes more sense and catches more information.
5 years ago
9f9ff84ba1
TestEngine: Added PushID() hooks.
5 years ago
b0e9092d6f
TestEngine: Added extra storage and global enable flag. Added missing ItemInfo hooks.
5 years ago
3233fbff0e
Internals: Added SetNextWindowScroll() ( #1526 )
5 years ago
1fd9e131e4
TreeNode: Fixed bug where dragging a payload over a TreeNode() with either _OpenOnDoubleClick or _OpenOnArrow would open the node. ( #143 )
5 years ago
e8c986b34e
Version 1.77 WIP
5 years ago
b8e2b2bd6b
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
5 years ago
5503c0a12e
Version 1.76
...
+ fixed PVS warning, update demo binaries, update readme image
5 years ago
f7852fa8e8
Internals: Extracted GetWindowScrollbarRect() out of Scrollbar() and tidying up code to make it more obvious how to draw over scrollbars. ( #3114 )
5 years ago
fb70d90fef
Made default clipboard handlers for Win32 and OSX use a buffer inside the main context instead of a static buffer, so it can be freed properly on Shutdown. ( #3110 )
5 years ago
4e7ceb5f90
Plot: Internals: Added hovered index to PlotEx() function. ( #2670 )
5 years ago
3930472f34
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
b7e1b13ca7
Update docs, FAQ, comments (mainly related to io.WantCaptureMouse / WantCaptureKeyboard flags).
5 years ago
fd56de1144
Nav: Store key mods associated to a nav request (for range_select) + use io.KeyMods.
...
+ renamed NavScoringRectScreen > NavScoringRect
5 years ago
0e884304ee
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.h
5 years ago
5be5add1ad
Selectable: Removed extraneous WindowPadding.x worth of width when auto-sized selectable label goes off available width (would not be noticeable) + Renamed ImGuiSelectableFlags_DrawFillAvailWidth to ImGuiSelectableFlags_SpanAvailWidth.
5 years ago
b4d1287011
Selectable: Clarifying the code around use of ImGuiSelectableFlags_DrawFillAvailWidth (with intent of trying to remove it).
...
Amend old 6251d3792bcafc86
5 years ago
9085c2cae2
Docking: Fixed unused definition leftover from a hasty merge.
5 years ago
16a9488c13
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
5 years ago
bdd31ec4db
Internal: Refactor: Moved RenderColorRectWithAlphaCheckerboard() to imgui_draw.cpp, tweaked signature.
5 years ago
0bbbbe0f68
Internal: Refactor: Moved RenderArrow, RenderBullet, RenderCheckMark to imgui_draw.cpp, changed RenderCheckMark to avoid using ImGui context
5 years ago
339ffd25a9
Internals: Renamed ImBoolVector to ImBitVector, added low-level loose function to replicate the behavior include a help SetBitRange() function.
5 years ago
1d5612a05e
Internal: Added two missing ImVec2 operators for consistency. Split up DragDropWithinSourceOrTarget
...
ImVec2 *= ImVec2 to match ImVec2 * ImVec2, likewise with /
5 years ago
ea0399414c
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
1abb02fb67
Viewports: Fix for UWP on IME code moved back-end side ( #2895 , #2892 ) + Docking: Comments.
5 years ago
9a46a19e99
Internals: Rename ImGuiSelectableFlags_PressedOnXXX to ImGuiSelectableFlags_SelectOnXXX, ImGuiButtonFlags_NoHoveredOnNav to ImGuiButtonFlags_NoHoveredOnFocus.
5 years ago
aef057e975
Internals: Added GetInputTextState() + comments.
5 years ago
fbaf65b8f6
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy ( #1542 )"
...
This reverts commit f2c7f3b200
5 years ago
f2c7f3b200
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy ( #1542 )
5 years ago
1ecc1db226
Fix GCC warning
5 years ago
a7ace918fe
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# imgui.cpp
5 years ago
0850b46c88
ImDrawList: Internals: Added IM_DRAWLIST_ARCFAST_TESSELLATION_MULTIPLIER setting.
5 years ago
05c3e0b898
Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
5 years ago
24bd33ace8
Menus: Some renaming, comments, add to demo. Amend 0342a3c. ( #1207 )
5 years ago
0342a3c548
Menus: Implement BeginMenu() appending to existing menu when executed with same ID multiple times. ( #1207 )
5 years ago
103c5edaaa
Internals: debug log macros.
5 years ago
75de34e281
Viewports, Docking: Added per-viewport work area system for e.g. menu-bars. Fixed DocksapceOverViewport() and demo code (overlay etc) ( #3035 , #2889 , #2474 , #1542 , #2109 )
...
Clarified that BeginMenuMainBar() had an incorrect knowledge of its height (which was previously harmless).
Designed to easily allow for status bars although we don't have/use them yet, but custom code could use them.
5 years ago
f032ad6b1f
Viewports: Renamed GetRect() to GetMainRect() in prevision for work rect. Comments
5 years ago
898e91f20d
Internals: Added TempInputText() to facilitate creation of custom widgets, renamed TempInputTextScalar() to TempInputScalar() etc. ( #2718 )
...
+ Minor imgui.h/todo comments
5 years ago
bb1e6f8af6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
5 years ago
b62f1ea8e9
Fix zealous PVS studio warnings. Minor tweaks.
5 years ago
ccaec1a270
Version 1.76 WIP
5 years ago
30bb15672d
Remove trailing spaces
5 years ago
d16c87a5b1
Internals: Minor renaming
5 years ago
8432d1bfc7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
58b3e02b95
Version 1.75
...
Comments
5 years ago
d37d25470a
Added IMGUI_DISABLE compile-time definition to make all headers and sources empty.
5 years ago
5be649e082
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
5 years ago
5a437f198c
Internals: GetItemStatusFlags(). Added Comments.
5 years ago
4b4be11fd2
Docking: Clarifying that DockNode!=NULL when DockIsActive. Comments. Cleanup.
5 years ago
47fab0e166
Misc renaming, comments. Docs: add missing spacing to Changelog.
5 years ago
9cff4d6e5e
Columns: ImDrawList::Channels* functions now work inside columns.
...
Use a private splitter in columns, paving way for removal of obsolete ImDrawList::Channels* functions.
5 years ago
8cbb693f47
Emscripten: Allow filesystem support. ( #3005 )
...
Filesystem functions perfectly work for Emscripten platform. This changes remove extra changes added by #2734 .
You can still disable filesystem functions by defining IMGUI_DISABLE_FILE_FUNCTIONS.
5 years ago
e7bfcb970e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
5 years ago
6e1f8be07b
Window: Fix SetNextWindowBgAlpha(1.0f) failing to override alpha component. ( #3007 )
5 years ago
0e89041997
Internals: ButtonEx, ButtonBehavior can support multiple mouse buttons.
5 years ago
bbe946fb6c
Minor fixes/tweaks (some to reduce drift wiih master branch)
5 years ago
5f4dfad5b7
Merge misc/shallow changes from Docking to reduce drift.
...
Most are comments. Fix menu bar clipping: 07ff47bf1b
5 years ago
6c1a73774d
Tooltip: Testing DragDropWithinSourceOrTarget in BeginTooltipEx() instead of just BeginTooltip() - feel this was an overlook. Added tooltip flags instead of using bool.
5 years ago
omar
Rokas Kupstys
Konstantin Podsvirov