ibachar
|
4f22a45cb5
|
Removed git merge leftovers
|
2019-05-04 15:02:28 +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 |
|
omar
|
56c3aaf6bd
|
Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.
|
2019-04-25 17:50:40 +02:00 |
|
omar
|
dd15b44230
|
Internals: TempInputText: Tidying up DragScalar / SliderScalar / TempInputTextScalar.
|
2019-04-25 17:50:40 +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
|
1ca6e5b59f
|
Examples: Glut: Added note about missing cursor support. (#2375, #2465)
|
2019-04-25 12:01:01 +02:00 |
|
omar
|
4dc4ace864
|
Window: Fixed window with the AlwaysAutoResize flag unnecessarily extending their hovering boundaries by a few pixels (this is used to facilitate resizing from borders when available for a given window). One of the noticeable minor side effect was that navigating menus would have had a tendency to disable highlight from parent menu items earlier than necessary while approaching the child menu.
+ Changelog fixed unfinished sentence and tweaks,
|
2019-04-25 11:50:28 +02:00 |
|
omar
|
16b18b265e
|
MenuItem, BeginMenu: Fix undesirable tall frames in horizontal layout context, which would be visible when trying to use rounded selectable/menus.
PushStyleVar: Added comments in the assert message.
Minor tweaks.
|
2019-04-25 11:34:07 +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
|
6789ea3482
|
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
|
2019-04-23 12:38:59 +02:00 |
|
David Amador
|
994a92d79d
|
Added support to use controllers via SDL_GameController. (#2509)
Updated sdl examples to use SDL_INIT_GAMECONTROLLER flag
|
2019-04-23 12:14:05 +02:00 |
|
omar
|
d0fb547dc1
|
Viewports: Avoid rendering/swapping secondary viewports that are minimized. (#1542, #2496)
|
2019-04-22 11:46:04 +02:00 |
|
omar
|
16e9b8191b
|
Increased IMGUI_VERSION_NUM arbitrarily, help narrowing down reports that don't include a commit hash. Add comments.
|
2019-04-22 11:16:17 +02:00 |
|
omar
|
f159eb35fb
|
Examples: SDL: Removed unused code. (#2484)
|
2019-04-22 10:43:14 +02:00 |
|
omar
|
20f0cb0281
|
Docking: Fixed an issue where DockBuilderSplitNode() wouldn't update the CentralNode shortcut immediately, which was problematic for immediately following DockBuilderDockWindow(). (#2109)
|
2019-04-19 20:28:43 +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
|
8d53f834ee
|
Demo: Documents: Fix misusage of ListBoxHeader().
|
2019-04-18 18:24:51 +02:00 |
|
omar
|
0e46d65b03
|
Misc: Fixed PushItemWidth(-width) (for right-side alignment) laying out certain items (button, listbox, etc.) with negative sizes if the 'width' argument was smaller than the available width at the time of item submission,
|
2019-04-18 15:46:13 +02:00 |
|
omar
|
a1cf7d636d
|
Internals: Rework CalcItemWidth / CalcItemSize but make their similarities and their differences more obvious. (#2449)
|
2019-04-18 15:46:13 +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 |
|
omar
|
240dddff87
|
Combo, Slider: Improve rendering in situation when there's there's very little space available.
|
2019-04-18 15:46:12 +02:00 |
|
omar
|
1aeee9d40f
|
Internals: Columns: Tweaks, renaming. Metrics: Show rectangles for child windows.
Renamed SameLine() first parameter.
|
2019-04-17 22:12:17 +02:00 |
|
omar
|
1d3ebef364
|
Columns: Fixed boundary of clipping being off by 1 pixel within the left column.
|
2019-04-17 21:51:13 +02:00 |
|
Andre Weissflog
|
74a3878be4
|
emscripten: replace shell_minimal.html with 'soft fullscreen' version
|
2019-04-17 11:59:26 +02:00 |
|