omar
|
04022114d9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
f242cd4d8a
|
Fixed GCC mem-access warnings (#2565)
+ using "if defined" more consistently for Clang.
|
6 years ago |
|
omar
|
4158cba1ff
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
fc3c3de551
|
Fixed uses of IsItemDeactivated(), IsItemDeactivatedAfterEdit() on multi-components widgets and after EndGroup(). (#2550, #1875)
|
6 years ago |
|
omar
|
99a845053a
|
Internal: Renamed fields + minor tweaks (probably shallow break stack-layout pr, sorry!)
|
6 years ago |
|
omar
|
64dbd932d2
|
Internal: Removed GetNextItemWidth(), relying on ItemAdd or NextItemData.ClearFlags() to clear the width data. Amend 5078fa20 and undo some of its effects of imgui_widgets.cpp
|
6 years ago |
|
omar
|
632469d2e5
|
Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.
|
6 years ago |
|
omar
|
36e714a459
|
Internal: Storing flags for NextWindowData so that we can clear everything with a single write and remove dummy condition fields.
|
6 years ago |
|
omar
|
0b485f12d7
|
Internal: Minor tidying/reordering of sections within ImGuiContext / window DC.
|
6 years ago |
|
omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
6 years ago |
|
omar
|
37174c85e2
|
Internal: Scrollbar: Extracted scrollbar code for other uses (eg. table v2 scrolling without using a child window).
|
6 years ago |
|
omar
|
e29176df53
|
Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.
|
6 years ago |
|
omar
|
a4d0b0efa4
|
Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. (#759) + misc comments
|
6 years ago |
|
omar
|
b7c2759f95
|
Columns: Fixed Separator from creating an extraneous draw command. Fixed Selectable with SpanAllColumns flag from creating an extraneous draw command. (#125)
|
6 years ago |
|
omar
|
239c8732d7
|
Viewports: Minor tweaks. (#2471)
|
6 years ago |
|
omar
|
42fc563fed
|
Version 1.71 WIP + fixed minor typo
|
6 years ago |
|
omar
|
d1d5075b66
|
Version 1.70
|
6 years ago |
|
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 |