omar
|
76e61958fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/README.txt
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
6c196cf432
|
Examples Readme and Changelog tweaks, added #2527, re-ordered examples/README alphabetically.
|
6 years ago |
|
omar
|
526e2303bc
|
Window: Fixed SetNextWindowSizeConstraints() with non-rounded positions making windows drift. (#2067, #2530)
|
6 years ago |
|
omar
|
9c1f02a42c
|
Misc: Made IMGUI_CHECKVERSION() macro also check for matching size of ImDrawIdx.
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
86f92fe756
|
Demo: Improved trees in columns demo. (#2136)
|
6 years ago |
|
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
|
6 years ago |
Max Thrun
|
7c6ba3a1da
|
ImDrawCallback_ResetRenderState: Added Metal.
|
6 years ago |
|
omar
|
5c1cd5c8c7
|
ImDrawCallback_ResetRenderState, Examples: Added support for reset render state callback. (#2037, #1639, #2452)
|
6 years ago |
|
omar
|
3fbc0b7a9e
|
Obsoleted GetContentRegionAvailWidth(), use GetContentRegionAvail().x instead. Kept inline redirection function.
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
0f2852806c
|
Amend 48a09a7 with changelog, breaking changes, tweak demo code for spacing. (#2518)
|
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
|
61d92580aa
|
Window: Fixed contents region being off by WindowBorderSize amount on the right when scrollbar is active.
|
6 years ago |
|
omar
|
c5d83d8af2
|
Separator: Declare its thickness (1.0f) to the layout, making items around separator more symmetrical.
|
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
|
56c3aaf6bd
|
Nav: Fixed Drag/Slider functions going into text input mode when keyboard CTRL is held while pressing NavActivate.
|
6 years ago |
|
omar
|
0ca1675ff9
|
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
|
6 years ago |
|
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,
|
6 years ago |
|
omar
|
6db0766564
|
Misc comments, internal renaming, added disable indentation option to Columns demo section.
|
6 years ago |
|
omar
|
6789ea3482
|
Examples: SDL: Gamepad support minor amend. Fixes ImGuiBackendFlags_HasGamepad not being set. Enable in Emscripten demo. Tweaks. (#2509, #2484).
|
6 years ago |
|
omar
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
5078fa208b
|
Added SetNextItemWidth() helper to avoid using PushItemWidth/PopItemWidth() for single items.
|
6 years ago |
|
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,
|
6 years ago |
|
omar
|
240dddff87
|
Combo, Slider: Improve rendering in situation when there's there's very little space available.
|
6 years ago |
|
omar
|
1d3ebef364
|
Columns: Fixed boundary of clipping being off by 1 pixel within the left column.
|
6 years ago |
|
omar
|
1f25cdd6b4
|
Clarified asserts comments + todo entries. (#2500)
|
6 years ago |
|
omar
|
7baf45cffa
|
Metrics: Added "Show windows rectangles" tool to visualize the different rectangles.
|
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
|
8130fd9816
|
Examples: DirectX10/11/12, Allegro, Marmalade: Render functions early out when display size is zero (minimized). (#2496)
|
6 years ago |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
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.
|
6 years ago |
|
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)
|
6 years ago |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
30d81f53cb
|
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
|
6 years ago |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
6 years ago |
|
omar
|
b53630813e
|
Internals: Tweak ItemSize calls. Added todo items.
|
6 years ago |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
6 years ago |
|
omar
|
ccca76fdea
|
Merge branch 'vulkan_fix_master'
|
6 years ago |
|
omar
|
302af7b2c9
|
FAQ tweaks. Add missing entries in imgui.cpp (which until now where only in the README).
|
6 years ago |
|
omar
|
c8fd4afd75
|
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
|
6 years ago |
|
omar
|
bd351e9ac5
|
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
|
6 years ago |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
6 years ago |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
6 years ago |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
6 years ago |
|
omar
|
4f54a527ab
|
Vulkan: Renaming, we want InitInfo to source MinImageCount which is the "source" value (so viewport creation can use this). Made ImGui_ImplVulkan_DestroyFrameRenderBuffers public. (#2071)
|
6 years ago |
|
omar
|
66f4be2e13
|
Vulkan: Added extra parameter to ImGui_ImplVulkan_RenderDrawData(). User is in charge of owning/storing 1 ImGui_ImplVulkan_FrameRenderBuffers per in-flight rendering frame. Removed ImGui_ImplVulkan_SetFramesQueueSize. (#2461, #2348, #2378, #2097, #2071, #1677)
|
6 years ago |