omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-05-10 22:56:43 +02:00 |
|
omar
|
7c256fbd40
|
Internal: Extracted some of the Begin code into RenderWindowDecorations().
|
2019-05-10 22:45:52 +02:00 |
|
omar
|
72951a1a85
|
Internal: Extracted some of the Begin code into RenderWindowTitleBarContents().
|
2019-05-10 22:45:28 +02:00 |
|
omar
|
b50c61c961
|
Internal: Begin: Update rectangles before Scrollbar() which now uses them. Fixes 39eeda0.
|
2019-05-10 22:30:33 +02:00 |
|
omar
|
39eeda0227
|
Internal: Scrollbar: Further sane simplification (using InnerMainRect instead of duplicating calculations).
|
2019-05-10 18:52:29 +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
|
9534ef9b26
|
Separator: Revert 1.70 "Declare its thickness (1.0f) to the layout" change (c5d83d8a). It's not incorrect but it breaks existing some layout patterns. Will return back to it when we expose Separator flags.
|
2019-05-09 17:52:56 +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
|
9bf3f910c8
|
Viewports: Fix to avoid SetNextWindowViewport being overrided by creation of a standalone viewport. (#2544, #1542)
|
2019-05-08 18:20:13 +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
|
e6c982509d
|
Examples: DirectX9: Fixes for multi-viewports. Avoid using a depth/stencil target for secondary viewport. (#2520, #2502)
|
2019-05-06 12:12:32 +02:00 |
|
omar
|
9ddb8493d5
|
Examples: DirectX9: Fixes for multi-viewports, destroying all swap chains. (#2520, #2502)
|
2019-05-06 12:07:29 +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
|
d88121ff5b
|
Examples: DirectX9/10/11: Taking reference to device + subsequent merge of this in docking will fix DX9 issue #2524
|
2019-05-06 10:15:22 +02:00 |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
2019-05-06 10:02:59 +02:00 |
|
Max Thrun
|
5ecc9d5865
|
Examples: Metal: Add GLFW+Metal example
|
2019-05-06 09:51:21 +02:00 |
|
ibachar
|
4f22a45cb5
|
Removed git merge leftovers
|
2019-05-04 15:02:28 +02:00 |
|
omar
|
526e2303bc
|
Window: Fixed SetNextWindowSizeConstraints() with non-rounded positions making windows drift. (#2067, #2530)
|
2019-05-03 19:09:44 +02:00 |
|
omar
|
9c1f02a42c
|
Misc: Made IMGUI_CHECKVERSION() macro also check for matching size of ImDrawIdx.
|
2019-05-03 18:42:53 +02:00 |
|
omar
|
e2166db282
|
Internals: Fixed incorrect repeat delay/rate calculation in IsMouseClicked() with repeat flag leading to involontary but thankfully doubling the rate. Using our standard function, making the multiplicator explicit.
|
2019-05-03 15:06:06 +02:00 |
|
omar
|
2dc81057ec
|
Selectable: With ImGuiSelectableFlags_AllowDoubleClick doesn't return true on the mouse button releas efollowing the double-click. Only first mouse release + second mouse down (double-click) returns true. Likewise for internal ButtonBehavior() with both _PressedOnClickRelease | _PressedOnDoubleClick. (#2503)
|
2019-05-03 14:31:12 +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
|
825b61e4ba
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
|
2019-05-02 14:56:47 +02:00 |
|
omar
|
a1c432d1ad
|
Internals: SettingsHandlerWindow_ReadLine uses context parameter.
|
2019-05-02 14:30:35 +02:00 |
|
omar
|
ae405b83a4
|
Examples: Added missing per-renderer local changelogs. (#2037, #1639, #2452)
|
2019-04-30 22:28:29 +02:00 |
|
Max Thrun
|
7c6ba3a1da
|
ImDrawCallback_ResetRenderState: Added Metal.
|
2019-04-30 22:18:25 +02:00 |
|
omar
|
5c1cd5c8c7
|
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)
|
2019-04-30 22:15:59 +02:00 |
|
omar
|
3fbc0b7a9e
|
Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.
|
2019-04-29 18:33:08 +02:00 |
|
omar
|
db2d58a68b
|
Drag and Drop: Fixed drag source with ImGuiDragDropFlags_SourceAllowNullID and null ID from receiving click regardless of being covered by another window (it didn't honor correct hovering rules). (#2521)
|
2019-04-29 16:34:02 +02:00 |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-29 13:06:55 +02:00 |
|
omar
|
0f2852806c
|
Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. (#2518)
|
2019-04-29 12:44:17 +02:00 |
|
Richard Mitton
|
4c0f34fd5d
|
Improved algorithm for mitre joints on thick lines
|
2019-04-29 12:07:03 +02:00 |
|
omar
|
4dec744795
|
Tidying up BeginMenu() code + comments.
|
2019-04-29 00:02:02 +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
|
09db2f6dec
|
Fix 61d9258 when there is not scrollbar "Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active."
|
2019-04-28 18:50: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
|
00b3c830db
|
Internals: Begin: Moved OuterRectClipped/InnerMainRect/InnerClipRect computation higher up in the function, next to ContentsRect/WorkRect code. Removed commented out debug drawing code which is now available in Metrics window.
|
2019-04-26 23:33:09 +02:00 |
|
omar
|
61d92580aa
|
Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active.
|
2019-04-26 23:32:29 +02:00 |
|
omar
|
5d799d76ea
|
Internals: Nav scrolling uses InnerMainRect instead of InnerClipRect.
|
2019-04-26 23:31:51 +02:00 |
|
omar
|
c5d83d8af2
|
Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.
|
2019-04-26 23:31:31 +02:00 |
|
omar
|
a649d904d7
|
Examples: Emscripten: Fixed not enabling Docking and Nav by default. (#2494)
|
2019-04-26 00:28:28 +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 |
|