omar
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-05-10 22:56:43 +02:00 |
|
omar
|
39eeda0227
|
Internal: Scrollbar: Further sane simplification (using InnerMainRect instead of duplicating calculations).
|
2019-05-10 18:52:29 +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
|
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
|
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
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
2019-05-06 10:02:59 +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
|
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
|
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 |
|
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 |
|
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
|
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
|
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
|
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
|
0ca1675ff9
|
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
|
2019-04-25 16:03:47 +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
|
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 |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-04-19 19:52:45 +02:00 |
|
omar
|
5078fa208b
|
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
|
2019-04-18 18:29:28 +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
|
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
|
1d3ebef364
|
Columns: Fixed boundary of clipping being off by 1 pixel within the left column.
|
2019-04-17 21:51:13 +02:00 |
|
omar
|
1f25cdd6b4
|
Clarified asserts comments + todo entries. (#2500)
|
2019-04-17 09:59:03 +02:00 |
|
omar
|
7baf45cffa
|
Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.
|
2019-04-16 22:02:56 +02:00 |
|
omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2019-04-16 13:14:10 +02:00 |
|
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.
|
2019-04-16 13:07:43 +02:00 |
|
omar
|
8130fd9816
|
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
|
2019-04-15 18:47:36 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
omar
|
35cbf9c052
|
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
|
2019-04-15 15:48:38 +02:00 |
|
omar
|
c1848b185c
|
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
|
2019-04-15 01:28:44 +02:00 |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-13 18:53:00 +02:00 |
|
omar
|
30d81f53cb
|
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
|
2019-04-12 22:16:59 +02:00 |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
omar
|
b53630813e
|
Internals: Tweak ItemSize calls. Added todo items.
|
2019-04-08 16:13:51 +02:00 |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-07 16:23:31 +02:00 |
|
omar
|
ccca76fdea
|
Merge branch 'vulkan_fix_master'
|
2019-04-07 16:22:47 +02:00 |
|
omar
|
302af7b2c9
|
FAQ tweaks. Add missing entries in imgui.cpp (which until now where only in the README).
|
2019-04-07 16:22:41 +02:00 |
|