omar
|
c72040a715
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_osx.h
# examples/imgui_impl_osx.mm
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2019-05-29 16:20:26 +02:00 |
|
omar
|
40b9e5e0b4
|
ImDrawList: Store initial flags for the frame in ImDrawListSharedData, reducing code duplication in setting up the flags.
|
2019-05-29 14:26:03 +02:00 |
|
omar
|
cb7ba60d3f
|
CollapsingHeader: When a close button is enabled, better clip the label to avoid overlap. (#600)
|
2019-05-28 21:25:28 +02:00 |
|
omar
|
70d9f79312
|
Internal: Renamed InnerMainRect to InnerVisibleRect. Printing coordinates in Metrics window.
|
2019-05-28 11:23:04 +02:00 |
|
omar
|
5b0e59d9d5
|
Docking: Saving local _NoResize flag. (#2583)
|
2019-05-27 22:11:21 +02:00 |
|
omar
|
7c06d9f043
|
Docking: Saving the NoTabBar, NoWindowMenuButton, NoCloseButton fields of dock node into the .ini file. Added them to the Metrics window. (#2583, #2423, #2109).
|
2019-05-27 17:06:17 +02:00 |
|
omar
|
9c35344175
|
Comments, todo entries, moved ImGuiSelectableFlagsPrivate in higher ranges to match others.
|
2019-05-27 16:50:56 +02:00 |
|
omar
|
511e32e8ca
|
Docking: Clarified terminology of docking/tablist/collapse button into Window Menu button matching master. Added private ImGuiDockNodeFlags_NoWindowMenuButton, ImGuiDockNodeFlags_NoCloseButton flags. (#2583, #2109)
|
2019-05-27 12:35:20 +02:00 |
|
omar
|
afad952450
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2019-05-24 21:58:17 +02:00 |
|
omar
|
6c3697f6f1
|
Internal: CloseButton takes an upper-left corner + a size to be consistent with similar widgets.
|
2019-05-24 17:58:21 +02:00 |
|
omar
|
ec3ec24157
|
Internals: Extracted some of the tab bar shrinking code into a ShrinkWidths() function so columns/table can use it.
|
2019-05-24 14:32:33 +02:00 |
|
omar
|
fda1365c15
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-05-23 00:04:25 +02:00 |
|
omar
|
7bc03f7155
|
Internals: Added InnerWorkRect equal to old InnerClipRect, added InnerWorkRectClipped actually clipped.
|
2019-05-22 23:56:31 +02:00 |
|
omar
|
a2eec8f5b5
|
Fix OuterRectClipped not being clipped correctly, which resulted in child window outside visible bound to not be marked with SkipItems. Broken in b50c61c961.
+ Comments on InnerClipRect being misleading. Demo: Tweak to sizing of child window in the Layout->Scrolling section.
|
2019-05-22 22:14:31 +02:00 |
|
omar
|
04022114d9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-05-21 14:47:29 +02:00 |
|
omar
|
f242cd4d8a
|
Fixed GCC mem-access warnings (#2565)
+ using "if defined" more consistently for Clang.
|
2019-05-19 17:15:14 +02:00 |
|
omar
|
4158cba1ff
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
2019-05-13 19:23:18 +02:00 |
|
omar
|
fc3c3de551
|
Fixed uses of IsItemDeactivated(), IsItemDeactivatedAfterEdit() on multi-components widgets and after EndGroup(). (#2550, #1875)
|
2019-05-13 19:05:41 +02:00 |
|
omar
|
99a845053a
|
Internal: Renamed fields + minor tweaks (probably shallow break stack-layout pr, sorry!)
|
2019-05-13 18:26:28 +02:00 |
|
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
|
2019-05-13 15:29:00 +02:00 |
|
omar
|
632469d2e5
|
Renamed SetNextTreeNodeOpen() to SetNextItemOpen(). Refactored SetNextItemXXX stuff to match SetNextWindowXXX code closely.
|
2019-05-13 15:11:25 +02:00 |
|
omar
|
36e714a459
|
Internal: Storing flags for NextWindowData so that we can clear everything with a single write and remove dummy condition fields.
|
2019-05-13 14:57:30 +02:00 |
|
omar
|
0b485f12d7
|
Internal: Minor tidying/reordering of sections within ImGuiContext / window DC.
|
2019-05-13 14:02:03 +02:00 |
|
omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-05-10 22:56:43 +02:00 |
|
omar
|
37174c85e2
|
Internal: Scrollbar: Extracted scrollbar code for other uses (eg. table v2 scrolling without using a child window).
|
2019-05-10 18:52:23 +02:00 |
|
omar
|
e29176df53
|
Internals: Columns: Renamed fields. Comments and tweak. Moved a demo block.
|
2019-05-09 13:12:09 +02:00 |
|
omar
|
a4d0b0efa4
|
Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. (#759) + misc comments
|
2019-05-09 12:55:01 +02:00 |
|
omar
|
b7c2759f95
|
Columns: Fixed Separator from creating an extraneous draw command. Fixed Selectable with SpanAllColumns flag from creating an extraneous draw command. (#125)
|
2019-05-09 12:10:36 +02:00 |
|
omar
|
239c8732d7
|
Viewports: Minor tweaks. (#2471)
|
2019-05-08 18:33:08 +02:00 |
|
omar
|
42fc563fed
|
Version 1.71 WIP + fixed minor typo
|
2019-05-07 16:36:08 +02:00 |
|
omar
|
d1d5075b66
|
Version 1.70
|
2019-05-06 14:17:39 +02:00 |
|
omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2019-05-06 10:16:43 +02:00 |
|
omar
|
86f92fe756
|
Demo: Improved trees in columns demo. (#2136)
|
2019-05-02 21:32:36 +02:00 |
|
omar
|
ce19cb465f
|
Internals: Rename GetContentRegionMaxScreen() -> GetWorkRectMax(). At this point this is mostly useful to facilitate merge of other branches.
|
2019-05-02 16:29:40 +02:00 |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-29 13:06:55 +02:00 |
|
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).
|
2019-04-28 22:33:58 +02:00 |
|
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.
|
2019-04-28 22:18:51 +02:00 |
|
omar
|
3276b12765
|
Internals: Added DataTypeApplyOp, DataTypeApplyOpFromText to imgui_internal.h
|
2019-04-28 20:55:51 +02:00 |
|
omar
|
4e81b2d093
|
Internals: Renaming. Renamed ImGuiPopupRef to ImGuiPopupData for consistency and added constructor.
|
2019-04-28 17:15:08 +02:00 |
|
omar
|
3d363c91fd
|
Internals: Exposed ImGuiDataTypeInfo, DataTypeGetInfo(), DataTypeFormatString(). Comments.
|
2019-04-28 15:27:18 +02:00 |
|
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
|
2019-04-25 17:53:11 +02:00 |
|
omar
|
0ca1675ff9
|
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
|
2019-04-25 16:03:47 +02:00 |
|
omar
|
59a3f0476d
|
Internals: Using more explicit PushOverrideID() helper + renamed equivalent internal tree helper.
|
2019-04-25 15:21:22 +02:00 |
|
omar
|
6db0766564
|
Misc comments, internal renaming, added disable indentation option to Columns demo section.
|
2019-04-24 17:40:07 +02:00 |
|
omar
|
d0fb547dc1
|
Viewports: Avoid rendering/swapping secondary viewports that are minimized. (#1542, #2496)
|
2019-04-22 11:46:04 +02:00 |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-04-19 19:52:45 +02:00 |
|
omar
|
59f012d656
|
Internals: ImHashStr() default parameter.
|
2019-04-19 19:48:51 +02:00 |
|
omar
|
5078fa208b
|
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
|
2019-04-18 18:29:28 +02:00 |
|
omar
|
f355a40367
|
Added commentary about ContentRegion functions. Added internal GetContentRegionMaxScreen() to facilitate internal code at the moment.
|
2019-04-18 15:46:13 +02:00 |
|
omar
|
9d4a893a77
|
Internals: Moved CalcItemSize next to CalcItemWidth, added comments to clarify their respective intent. Should have no side effect.
|
2019-04-18 15:46:12 +02:00 |
|