omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
86f92fe756
|
Demo: Improved trees in columns demo. (#2136)
|
6 years ago |
|
omar
|
ce19cb465f
|
Internals: Rename GetContentRegionMaxScreen() -> GetWorkRectMax(). At this point this is mostly useful to facilitate merge of other branches.
|
6 years ago |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
842a720e72
|
Popups: Closes popup at the time of FocusWindow(). Fixes right-click from closing all popups instead of aiming at the hovered popup level (regression in 1.67's ae76a1fd).
|
6 years ago |
|
omar
|
bda2cde68e
|
Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517)
Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.
|
6 years ago |
|
omar
|
3276b12765
|
Internals: Added DataTypeApplyOp, DataTypeApplyOpFromText to imgui_internal.h
|
6 years ago |
|
omar
|
4e81b2d093
|
Internals: Renaming. Renamed ImGuiPopupRef to ImGuiPopupData for consistency and added constructor.
|
6 years ago |
|
omar
|
3d363c91fd
|
Internals: Exposed ImGuiDataTypeInfo, DataTypeGetInfo(), DataTypeFormatString(). Comments.
|
6 years ago |
|
omar
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
6 years ago |
|
omar
|
0ca1675ff9
|
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
|
6 years ago |
|
omar
|
59a3f0476d
|
Internals: Using more explicit PushOverrideID() helper + renamed equivalent internal tree helper.
|
6 years ago |
|
omar
|
6db0766564
|
Misc comments, internal renaming, added disable indentation option to Columns demo section.
|
6 years ago |
|
omar
|
d0fb547dc1
|
Viewports: Avoid rendering/swapping secondary viewports that are minimized. (#1542, #2496)
|
6 years ago |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
59f012d656
|
Internals: ImHashStr() default parameter.
|
6 years ago |
|
omar
|
5078fa208b
|
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
|
6 years ago |
|
omar
|
f355a40367
|
Added commentary about ContentRegion functions. Added internal GetContentRegionMaxScreen() to facilitate internal code at the moment.
|
6 years ago |
|
omar
|
9d4a893a77
|
Internals: Moved CalcItemSize next to CalcItemWidth, added comments to clarify their respective intent. Should have no side effect.
|
6 years ago |
|
omar
|
1aeee9d40f
|
Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows.
Renamed SameLine() first parameter.
|
6 years ago |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
|
omar
|
742b5f4c68
|
Merged a bunch of small changes from Docking branch to reduce the difference between branches.
Noticeable: horizontal alignment of CloseButton. Menu fill take account of border. Various stylistic tweaks to accomodate other changes in Docking.
|
6 years ago |
|
omar
|
311469e9d6
|
Internals: Columns: Some renaming, extracted code into GetColumnsID().
|
6 years ago |
|
omar
|
f70eacee8e
|
Docking: Internal: Added helper for automation to process docking at the mouse level.
|
6 years ago |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
224f087a5f
|
Docking: Rename typo Autority -> Authority + Rename DockContextNewFrameUpdateDocking -> DockContextUpdateDocking.
|
6 years ago |
|
omar
|
fb2626c21b
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
6 years ago |
|
omar
|
092426bed2
|
Docking: Hold Shift to force disable docking. (#2109)
|
6 years ago |
|
omar
|
c6f1b7b92a
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
6 years ago |
|
omar
|
ee02cdbf03
|
Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)
|
6 years ago |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
07a70dc972
|
Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.
|
6 years ago |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
1391904fd2
|
Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684, #2341)
|
6 years ago |
|
omar
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
6 years ago |
|
omar
|
8dab7ac021
|
InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. (#2467, #1336)
|
6 years ago |
|
omar
|
9bf6509c6e
|
Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. (#2109) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system (#2304)
|
6 years ago |
|
omar
|
5af385ea78
|
Viewport: Renamed member + added note about a Docking issue with restoring focus.
|
6 years ago |
|
omar
|
b6ae8a0dca
|
Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). (#2453, #2109)
|
6 years ago |
|
omar
|
a33d45d7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
6 years ago |
|
omar
|
9a0e71a6ec
|
Internals: Renamed the ImGuiWindow HiddenFrameXXX fields to decorrelate them from resizing behavior, as those values are set by other logic.
|
6 years ago |
|
omar
|
5a665e423c
|
Docking: Added ImGuiDockNodeFlags_NoTabBar (not exposed publicly). (#2423, #2109)
|
6 years ago |
|
omar
|
fc95da8aa3
|
Docking: Internals: Moved CentralNode and HiddenTabBar state into LocalFlags for consistency. (#2423, #2109)
|
6 years ago |
|
omar
|
fd5859ed04
|
Docking: Separating SharedFlags vs LocalFlags in dock node so settings can be applied to individual nodes. Made _NoResize logic on single node applies as expected. (#2423, #2109)
|
6 years ago |
|
omar
|
8d4b5fef1d
|
Renamed ImGuiDockNodeFlags_Dockspace to ImGuiDockNodeFlags_DockSpace for consistency. DockBuilderCopyDockspace() to DockBuilderCopyDockSpace(). Made casing consistent elsewhere. (#2109)
|
6 years ago |
|
omar
|
04a9ce3a18
|
Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109)
|
6 years ago |
|
omar
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
6 years ago |
|
omar
|
cf2c52282d
|
Version 1.70 WIP
|
6 years ago |
|
omar
|
b1af4d36ce
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |