Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,017 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'docking'
${ noResults }
Commit Graph

956 Commits (docking)

Author SHA1 Message Date
ocornut d2ffbd9b86 Version 1.84 
Fix PVS Studio false positive //-V1020
Fix missing #ifndef for IMGUI_IMPL_OPENGL_LOADER_CUSTOM path
 3 years ago
ocornut c543d93af1 Expose BeginDisabled()/EndDisabled() in public API. Add to demo. (#211) 3 years ago
ocornut 0b06c4b2b0 Merge branch 'master' into docking (will need further for io.AddFocusEvent) 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 3 years ago
ocornut 161b74e871 Fix tabbing in/out of an InputTextMultiline(), broken by 6b8a059. 3 years ago
Oliver 'kfsone' Smith 7e9e1ff1c2 InputText: Fix named filtering flags disabling newline or tabs in multiline inputs (#4409, #4410) 3 years ago
ocornut f9b5168fb3 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
 3 years ago
ocornut e362c5af48 Internals: ColorEdit: renamed some internal masks to match our common coding style. 
ImGuiColorEditFlags__DisplayMask > ImGuiColorEditFlags_DisplayMask_, ImGuiColorEditFlags__OptionsDefault > ImGuiColorEditFlags_DefaultOptions_, ImGuiColorEditFlags__DataTypeMask > ImGuiColorEditFlags_DataTypeMask_  etc.
 3 years ago
ocornut 7bfc379a23 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 3 years ago
ocornut 90bf996e1a Internals: widgets always read back from g.LastItemData.InFlags (so we can now modify per-item disable state more easily). (#211) 3 years ago
ocornut 6b8a059fc9 Internals: moved LastItem data to a shared structure (instead of one per window) 
(should be a no-op as we are restoring things in Begin/End. Toward faciliate backup/restore of LastItemData and favor pulling from here instead of CurrentItemFlags, toward #211)
 3 years ago
ocornut 1ad153056a Internals: ItemAdd: set LastItemXXX fields before navigation calls + comments about io.IniFilename (#4294) 3 years ago
ocornut 17ec4f1f6f TestEngine, MenuItem: call IMGUI_TEST_ENGINE_ITEM_INFO() at the right stack level. (amend f8fae02) 3 years ago
ocornut 246ad6c03c Disabled: items more consistently release active id if the active item got disabled. (#211) (amend 2952525) 3 years ago
ocornut a11f36811f Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_vulkan.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
 3 years ago
Rokas Kupstys 5dd1e38b7a Disabled: disabled items set HoveredId, allowing e.g. HoveredIdTimer to function. (#211, #3419) + Menus: fix hovering a disabled menu or menu item not closing other menus. 
Rework of https://github.com/rokups/imgui/commit/c24b470
Note that the declared intent of that commit "Prevents window from being dragged if mouse hovers a disabled item." was already fullfilled by a876ad87.
Changes in ButtonBehavior() not needed anymore since ImGuiButtonFlags_Disabled is gone
 3 years ago
ocornut cac869b333 Disabled: don't prevent Selectable() from being selected. (#211) + BeginMenu()/MenuItemEx() uses PushDisabled() the standard way. 
ImGuiSelectableFlags_Disabled is now unused by the library and might be marked obsolete later.
 3 years ago
ocornut 29525255f3 Disabled items more consistently release active id if the active item got disabled. (#211) 3 years ago
ocornut ba1c8464ef Internals: Removed ImGuiButtonFlags_Disabled (which had inconsistent behavior) in favor of ImGuiItemFlags_Disabled. Selectable()'s ImGuiSelectableFlags_Disabled now uses the later. (#211) 3 years ago
ocornut f6682404e1 InputInt/InputFloat: When used with Steps values and _ReadOnly flag, the step button look disabled. (#211) 3 years ago
ocornut 97638bf977 BeginMenu: remove unnecessary call to ItemHoverable() which is already done by the Selectable() call. 
Amend 88d7b3de
 3 years ago
ocornut 4a100f7f11 Nav: Disabled items are not candidate for default focus. (#211, #787) + simplify handling of ImGuiButtonFlags_PressedOnDragDropHold path. 3 years ago
ocornut f8fae02270 Menus: rework to allow for an icon column (not yet exposed, but usable via internals) + fix menus being affected by style.SelectableTextAlign (#126) 3 years ago
ocornut 696d3e056e Internals: Menus: Naming offset field + fix spacing/offset computation to handle more offsets. 3 years ago
ocornut 3512f2c2c2 Internals: Menus: minor tidying up + renaming in ImGuiMenuColumns + removing extraneous offset field which is always zero + using smaller types. 
sizeof() 36 -> 20
 3 years ago
ocornut 0f7eb00f67 Backends: amends to 1db1066 + merge minor bits from docking incl SetActiveIdUsingNavAndKeys(). 
No need to clear fields before deletion. DX12: renamed to match docking branch.
 3 years ago
ocornut ac35b4bba2 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
#	imgui.h
#	imgui_demo.cpp
 3 years ago
ocornut 20d415e939 FIx static analysers warnings and disable false positives. 3 years ago
ocornut 1965f38e9e ImGuiWindowFlags_UnsavedDocument/ImGuiTabItmeFlags_UnsavedDocument display a dot instead of a '*'. 3 years ago
ocornut f0c4d609a6 Default window focus scope not 0. Added ImGuiSelectableFlags_SelectOnNav with comments and caveats. (#1861, #4242,) 
Focus scope default value: amend 7ee623d9 a5041c88 2ebe08be
 3 years ago
ocornut a15c42d5bd Nav: moved RenderNavHighlight() calls of TreeNode and Selectable out of if (hovered || selected) tests. Should make no difference as NavId currently returns hovered. (#1861, #4242) 3 years ago
Rokas Kupstys d5828cd988 SplitterBehavior: fix using IsItemHovered() after SplitterBehavior() 3 years ago
ocornut 0cca0d1617 Internals/experimental: BeginComboPreview(), EndComboPreview(). (#4168, #1658) 
(amended)
 3 years ago
ocornut db0338a1f2 Nav, Drag and Drop, Docking: fixed two issues leading nav result to conflict with moving a window. (#4211, #3025) 3 years ago
ocornut 16abfa5eb6 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 3 years ago
ocornut 060b6ee7d1 Internals: Combo: Extracted into a BeginComboPopup() function. (#4168) 
Renamed frame_bb > bb locally.
 3 years ago
ocornut 5b4bc985ad Nav, Combo: removed unnecessary window->LastNavIds[] assignment in combo code. + minor renaming. 3 years ago
ocornut 79e18896fe TabBar: Fixed using more than 32 KB-worth of tab names. (#4176) 3 years ago
ocornut 1ad1429c6d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
#	docs/CHANGELOG.txt
 3 years ago
ocornut e31d13fa76 Version 1.84 WIP 3 years ago
ocornut 1b435ae3e0 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 3 years ago
ocornut ad5d1a8429 Version 1.83 3 years ago
ocornut 029c83c73e Combos: Changed the combo popup to use a different id to also using a context menu with the default item id. (#4167) 3 years ago
ocornut 5d77b6f274 Docs: update links, sponsors 3 years ago
ocornut 105d82d134 Docking: Docking node tab bar honors ItemInnerSpacing.x before first tab. Tweak rendering and alignment of dock node menu marker. (#4130) 
+ Fix ~0 in EndFrameDrawDimmedBackgrounds() which is obsolete way of signifying "all round corners".
 3 years ago
ocornut 45f5ed52c1 Menus: made MenuItem() in a menu bar reflect the 'selected' argument with a highlight. (#4128) 3 years ago
ocornut 86c2b609ef Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_glfw.cpp
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
 3 years ago
ocornut e7e170c534 InputText: Internal renaming to use our own types to clarify code a little bit. 3 years ago
ocornut 26a1bbfe1e InputText: Fixed CTRL+Arrow or OSX double-click leaking the presence of spaces when ImGuiInputTextFlags_Password is used. (#4155, #4156) [@michael-swan] 3 years ago
TheCherno 6d706d9302 Fixed ImGui bug that prevented image buttons from working when multiple frames are in flight 3 years ago
ocornut 31290807dc Merge branch 'master' into docking 
+ fix warning fix for mingw+dx9
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	imgui.cpp
 3 years ago
ocornut 393941ceea Refactor focusable/tabbalbe item registration toward allowing to handle it prior to clipping (not yet the case) (#343, #4079) 
Now performed in ItemAdd(). It can't be trivially moved above clipping effectively because it would require us to scroll to be useful, meaning we'd be better off locking the bounding box a frame earlier. Still wip.
As-is this commit has no value for end-user, but it's a reengineering that moves us closer to the solution. + Internals: moved internal flags.
 3 years ago
ocornut 9b90639577 Internals: ItemFlags is a shared resource as advertised. Fix Begin/PushItemFlags/End sequence (mostly for consistency) 3 years ago
ocornut 10a1c5b021 TestEngine: fixed wrong flags passed to ItemInfo queries. Was luckily/misleadingly not causing issues as the test-engine flags we tested were upper bits not colliding with the other type. 
Moved those flags higher as well. (unrelated to the fix itself)
 3 years ago
ocornut 89162a04f4 Fixes for PVS Studio and MSVC static analyzers. Using a macro to suppress single-use MSVC false positives. (#3938, #4073) 3 years ago
ocornut d28535f351 Fixes for Visual Studio 2019 static analyzers. (#3938, #4073) + two minor edge case were invalid scalar input (e.g. a sign only) would return buffer as modified. 3 years ago
ocornut 2dec7b3301 InputText: Align caret/cursor to pixel coordinates. (#4080) 3 years ago
ocornut daf97832f1 Internals: Nav: renaming. 4 years ago
ocornut 34d4bc620d Merge remote-tracking branch 'origin/master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
 4 years ago
ocornut 646c873598 Docking: Fixed reappearing docked windows with no close button showing a tab with extraneous space for one frame. 4 years ago
ocornut c283a1da5b Fixed clipping of multi-line value text when label is single-line + Fixed vertical alignment of single-line value text when label is multi-line. (#4004) 4 years ago
Doug Binks f08566b4d7 InputText: Do not filter private unicode codepoints (e.g. icons) when pasted from clipboard. (#4005) 4 years ago
ocornut 6ddcdbe3e8 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 4 years ago
ocornut 9251eac585 Docking: fix undocking from tab-bar by moving mouse horizontally, amend 3ed07a8 + d705192. 
Automation system may drag e.g. right-most tab far left (and vice-versa) and one frame and our current logic would fail at it.
 4 years ago
ocornut 3ed07a8f0b Docking: removed io.ConfigDockingWithShift option. (#2109) 4 years ago
ocornut 0e0a783b8c Docking: fix undocking from tab-bar by moving mouse horizontally, broken by d705192. 4 years ago
Chris Ohk eab3ae473c
Fix warning message C4100 (#3974) 
- warning C4100: 'fmt_out_size': unreferenced formal parameter
 4 years ago
ocornut 1dcd3a45cc ColorEdit4: Alpha default to 255 (instead of 0) when omitted in hex input. (#3973) 
Courtesy of @squadack
 4 years ago
ocornut b79b1cb9c0 TabBar: Amend previous commit. Fix tab reordering when tab bar has scrolling. 
Some tidying up with helpers + honor 16-bit offsets as with other tab bar features (unlikely single reorder can reach that but consistent)
 4 years ago
ocornut 688e06490e TabBar: Amend previous commit. Fix tab reordering when tab bar has scrolling. 
Some tidying up with helpers + honor 16-bit offsets as with other tab bar features (unlikely single reorder can reach that but consistent)
 4 years ago
Rokas Kupstys d7051928d9 TabBar: Use mouse position instead of hardcoded +1/-1 offset when reordering tabs. 
Fixes tab reordering in test engine when using fast mode.

# Conflicts:
#	imgui_widgets.cpp
 4 years ago
Rokas Kupstys 475c0fcc39 TabBar: Use mouse position instead of hardcoded +1/-1 offset when reordering tabs. 
Fixes tab reordering in test engine when using fast mode.
 4 years ago
ocornut e7577d570e Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_sdl.cpp
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_internal.h
#	imgui_widgets.cpp
 4 years ago
ocornut a58271c079 Internals: extracted a more reusable BeginViewportSideBar() out of BeginMainMenuBar(). (#3966, #3518) 
Complement ca34c81c in docking branch which removed assumption that we can't tell size ahead of Begin().
 4 years ago
ocornut ca34c81ce9 BeginMainMenuBar(): remove expectation that we don't know menu bar height ahead, allowing up to generalize placement in any direction (will be done in master) 
Amend 75de34e281
 4 years ago
ocornut 59da01901e Scrolling: Fix scroll tracking with e.g. SetScrollHereX/Y() when WindowPadding < ItemSpacing. Fix scroll snapping on edge of scroll region when both scrollbars are enabled. 
CalcNextScrollFromScrollTargetAndClamp() fixed snapping edge calculation missing ScrollbarSizes.y
 4 years ago
ocornut 81e0b18e38 Merge branch 'master' into docking 4 years ago
ocornut a1a39c632a Version 1.83 WIP 4 years ago
ocornut 4bf646e4b0 Drags, Sliders, Inputs: Specifying a NULL format to Float functions default them to "%.3f" to be consistent with the compile-time default. (#3922) 4 years ago
ocornut 256594575d Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago
ocornut 35b1148efb Version 1.82 4 years ago
ocornut 352f64697c Internals: rename legagy tab focus fields to TabFocusXXXX for clarity + removed one unnecessary FocusWindow() call. 4 years ago
ocornut d94644261d Drags, Sliders: Support ImGuiSliderFlags_Logarithmic flag with integers. Because why not? (#3786) 
Renamed is_decimal to is_floating_point.
 4 years ago
ocornut 287bd9b984 InputText: renamed ImGuiInputTextFlags_AlwaysInsertMode to ImGuiInputTextFlags_AlwaysOverwrite. (#2863) 4 years ago
ocornut 0157502eab ImDrawFlags: rework/revert c2d6d26 + 39432bf in a way that is closer to old version and back to opt-in but with default 0 = all corners. 4 years ago
ocornut 033dfd9d35 ImDrawFlags: rework/revert c2d6d26 + 39432bf in a way that is closer to old version and back to opt-in but with default 0 = all corners. 4 years ago
ocornut f1bf642e8f Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	misc/debuggers/imgui.natvis
 4 years ago
Rokas Kupstys c2d6d26139 ImDrawList: upgraded AddRect(), AddRectFilled(), PathRect() to use general ImDrawFlags instead of ImDrawCornersFlags 4 years ago
C.Even a3ebd160cb
Fix unused variable warning in ImGui::EndListBox() (#3897) 4 years ago
ocornut 6ba1334903 Nav: internals: renaming ImGuiInputSource so it is not specific to nav. Comments. 4 years ago
Rokas Kupstys 01a2bac7d5 DrawList: Replace "bool close" in drawing functions with flags. 4 years ago
ocornut a64e0eb3a4 Nav: merged SetNavID() and SetNavIDWithRectRel() to improve sanity, moved flags overwrite off them. (#787) 4 years ago
ocornut 4bb5a36f90 Nav: do not clear per-window NavId when window reappears. Process NavInit regardless of current highllight state. Consistently set g.NavLayer in SetNavID(). (#787) 4 years ago
ocornut e842b196df Amend sanitization of format strings. Support ' without stb_printf. Simpler loops, will also be used for ImStrv branch. (8ee77f1) (#3604) 
Widgets: Sliders: Fix a bug where numbers after format specifier (eg. %d123) would cause RoundScalarWithFormatT() return incorrect value.
 4 years ago
Rokas Kupstys 8ee77f1b65 Widgets: Sliders: Skip custom stb_sprintf.h format flags (', #, _) in RoundScalarWithFormatT() as they break ImAtof()/ImAtoi() and cause Drag*()/Slider*() widgets display incorrect values. (#3604) 
Widgets: Sliders: Fix a bug where numbers after format specifier (eg. %d123) would cause RoundScalarWithFormatT() return incorrect value.
 4 years ago
ocornut 705f082674 Internals: rename RootWindow->RootWindowDockTree, RootWindowDockStop->RootWindow. 
Why?  So by default RootWindow matches user expectation on both branches, and RootWindowDockTree is more intentful.
(Actually should reduce diff between master<>docking)
 4 years ago
ocornut 80533ea5e1 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 4 years ago
ocornut fdebb2e093 Internals: removed HoveredRootWindow, tweak IsWindowHovered(). 4 years ago
ocornut 6aee4bcdc5 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago
ocornut 3776ba565f Internals: TabBar: minor tweaks and renaming. 4 years ago
ocornut a8f76c23a4 Window: Shrink close button hit-testing region when it covers an abnormally high portion of the window visible area (e.g. when window is collapsed and moved in a corner)to facilitate moving the window away. (#3825) 4 years ago
ocornut 0ecdf8167c DragScalar: Fixed crash when using DragScalar() directly with ImGuiSliderFlags_AlwaysClamp + only one of either p_min or p_max set. (#3824) [@harry75369] 4 years ago
ocornut ffa863a3ba Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx10.cpp
#	backends/imgui_impl_dx11.cpp
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	backends/imgui_impl_opengl3.cpp
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	examples/example_glfw_vulkan/main.cpp
#	examples/example_sdl_vulkan/main.cpp
#	imgui.cpp
 4 years ago
ocornut 30b7545841 Version 1.82 WIP 4 years ago
ocornut 239d09804d Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
 4 years ago
ocornut 4df57136e9 Version 1.81 4 years ago
ocornut f14042ca78 Viewports Added ImGui::GetMainViewport() as a way to get the bounds and work area of the host display. (#3789, #1542) 
Viewports: Backport a few constructs from 'docking' branch.
Viewports: Added ImGuiViewportFlags_IsPlatformWindow, ImGuiViewportFlags_IsPlatformMonitor, ImGuiViewportFlags_OwnedByApp (none of them were in docking branch yet). ImGuiViewportFlags_IsPlatformMonitor is merely there to convey future intent, not yet used.
Reduce uses of io.DisplaySize.
MainMenuBar: Backport work area handling code from 'docking' branch.
Metrics: Backported "Viewports" debug visualizer from 'docking' branch.
Demo: Rework 'Examples->Fullscreen Window'.
Demo: 'Simple Overlay' demo now moves under main menu-bar (if any) using GetMainViewport()'s work area.
 4 years ago
ocornut 2a5eaf239f Misc tweaks - mostly toward minimizing diff in upcoming backport merge of a few viewport structures in master 4 years ago
ocornut 7a516a266d Merge remote-tracking branch 'origin/master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
 4 years ago
ocornut 1a3af8cb4c Viewports: trying to treat GetMainViewport() as const. Reducing unnecessary casts of ImGuiViewportP* 
Metrics: readded root Drawlists node in metrics to match master.
The (void*) casts are implying const-casst but currently left GetMainViewport() as returning non-const.
 4 years ago
ocornut fa55b0cb60 Viewports: (breaking) removed ImGuiPlatformIO::MainViewport which is now pretty much unused and duplicate (and misleading as we will evolve the concept) 
Use GetMainViewport() if stuck.
 4 years ago
ocornut 03d74a293d ListBox: renamed ListBoxHeader>BeginListBox, ListBoxFooter>EndListBox. Added demo bits. 4 years ago
ocornut 6f6d4e0b70 ListBoxHeader: In version taking height in number of items, made vertical padding consistent regardless of if (items_count <= height_in_items) or not. 
Demo: Tweaks.
 4 years ago
ocornut e5cbf60def ListBox: tweaked default height calculation. simplifying code internally (rework passing of full rect). Should have no visible side-effects + misc comments. 4 years ago
freddii 90a518c501 Fixed typos (#3782) 4 years ago
ocornut d1a9efdd8f InputText: Fixed slightly off ScrollX tracking, noticeable with large values of FramePadding.x. Multiline: Fixed padding/cliprect not matching single-line version. (#3781) 
Fixed FramePadding.y worth of vertical offset when aiming with mouse.
 4 years ago
ocornut a3f0393351 Menus: Fixed an issue with child-menu auto-sizing (issue introduced by 6af92b0) (#3779) 4 years ago
ocornut 929563c3a7 Log/Capture: Fixes for handling \n in strings. Improve the look of various widgets. Added LogSetNextTextDecoration helper. Fixup/amend dbaf74d75. 
For now removed LogRenderedTextNewLine() - it is eventually desirable but currently carries too much ambiguities, so reverted until we have a better system and test suite.
 4 years ago
Louis Schnellbach dbaf74d758 Log/Capture: Fix various new line/spacing issue by using same render text position when there are both RenderText and LogRenderedText call in widget code. 
Also Buttons are now enclosed in bracket
 4 years ago
Erwin Coumans 4dec436161 SliderInt: Fixed click/drag when v_min==v_max from setting the value to zero. (#3774) 4 years ago
ocornut 577e7cb493 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago
Sammy Fatnassi 376c88a864 Fixed some compile warnings with Clang on Windows (#3754) 4 years ago
ocornut 2ed47e5822 Version 1.81 WIP 4 years ago
ocornut bb26751b94 Merge branch 'master' into docking 
# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
 4 years ago
ocornut 58075c4414 Version 1.80 4 years ago
ocornut 6737037743 Tab Bar: fix 0ea4408 (#3414) 4 years ago
ocornut 74b3b7cf58 Added experimental io.ConfigDragClickToInputText feature to enable turning DragXXX widgets into text input with a simple mouse click-release (without moving). (#3737) 
+ Offset ImGuiTableColumnFlags values.
 4 years ago
ocornut dc0f3d982c DragFloat, DragInt: very slightly increased mouse drag threshold + expressing it as a factor of default value + disabled experimental click-to-input on DragXXX functions. (#3737) 4 years ago
ocornut 0ea4408fd4 Tab Bar: Requested ideal content size (for auto-fit) doesn't affect horizontal scrolling. Followup to afa01d8. (#3414) 
+ minor Table rename
 4 years ago
ocornut 6af92b05bf Internals: Layout: maintain two content sizes, optionally writing to IdealMaxPos to distinguish used from ideal size, later is used for auto-fit. Unused in this commit, should be no-op. (#3414) 
# Conflicts:
#	imgui.cpp
 4 years ago
ocornut 388ca563db Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
 4 years ago
ocornut b0db741770 Demo tweaks. Moved Tabs to Widgets section. Added to Tables demo. Increased version following 00b35c08. 4 years ago
ocornut 002ba1a69f Tables: comments, tweak. CollapsingHeader: comments. (#3715) 4 years ago
ocornut b11518d7d7 Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_opengl2.cpp
#	backends/imgui_impl_opengl3.cpp
#	imgui.cpp
 4 years ago
ocornut 9bcf77eb81 Fixed using IsItemEdited() after Combo() not matching the return value from Combo(). (#2034) + fix some PVS warnings, fix typo, blanks. 
Amend e28b1078
 4 years ago
ocornut 1c1d3b7ab5 Added 64-bit variants of CheckboxFlags() in imgui_internal.h. Improve assert on mismatched ListBoxFooter() call. Fix FAQ index. (#3687) 4 years ago
ocornut b015ea93fd Style tweaks, disabled default window rounding by default, reduced size of resize grip, made less prominent, increased WindowBg alpha in classic style. 
TestEngine: Fixed Checkbox() not reporting its checkable state when clipped.
 4 years ago
ocornut 7b53551032 Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui.h
 4 years ago
ocornut 1fb26d18c4 Tables: fixed seemingly unnecessarily copy of ImGuiTableColumnFlags_NoDirectResize_ which broken resizing from W3| in a F1 W3 F2 setup. Header only allow overlap on hover, not when active (amend f2df804f) 
Otherwise TableUpdateBorders() tends to override mouse cursor.
 4 years ago
ocornut dd4ca70b0d Merge branch 'master' into docking 
# Conflicts:
#	backends/imgui_impl_win32.cpp
#	imgui.cpp
#	imgui_demo.cpp
 4 years ago
ocornut 7aed4b152b Tables: improve index, file structure tweaks. 4 years ago
ocornut 5ef7b831c2 Tables: removed ImGuiTableSortSpecs::ColumnsMask because it needlessly exposes our 64-columns limitation which we'd eventually would like to lift 
+ shuffle declarations in internals
 4 years ago
ocornut 82cf41d804 Tables: tooltip on clipped TableHeader() (amended) 4 years ago
ocornut 507db499e4 Tables: work on background draw channel handling (amend "create a separate background draw channel") + Selectable disable spacing when spanning. 4 years ago
omar 8e97cdf8e8 Tables: Fix for calling TableSetBgColor(ImGuiTableBgTarget_CellBg) multiple times on the same cell. 4 years ago
omar 8da7d3c3e5 Tables: Initial commit. [Squashed 123+5 commits from tables_wip/] 4 years ago
ocornut 818e1a4eb4 Tables: Moving legacy Columns code 4 years ago
ocornut c1ffac2fee Merge branch 'master' into docking 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 4 years ago
ocornut ae3e2406ec Misc tweaks/fixes (see details). 
Combo: ultra minor fix for popup positioning policy mismatch depending on ImGuiComboFlags_PopupAlignLeft flag.
Made ImHashXXX functions return ImGuiID.
IsWindowNavFocusable use !WasActive.. it worked because it was only called in NewFrame()->NavUpdate() before the transition loop + EndFrame() only.
Fix unused variable warning.
 4 years ago
ocornut d4f08d893e InputText: Fixed swiching from single to multi-line while preserving same ID. 4 years ago
ocornut c0ac4fb788 Columns/Internals: (Breaking): Renamed data structures. (#125, #513, #913, #1204, #1444, #2142, #2707) 4 years ago