omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-13 18:53:00 +02:00 |
|
omar
|
e805ca29d8
|
Internals: Moved resize grips and borders to nav layer 1 so that testing system doesn't attempt to scroll to get them inside the InnerRect.
|
2019-04-13 18:51:32 +02:00 |
|
omar
|
800fb26606
|
Docking: Renamed target_node > node in some functions to facilitate debugger watch use across functions.
|
2019-04-13 00:36:24 +02:00 |
|
omar
|
224f087a5f
|
Docking: Rename typo Autority -> Authority + Rename DockContextNewFrameUpdateDocking -> DockContextUpdateDocking.
|
2019-04-13 00:36:24 +02:00 |
|
omar
|
fb2626c21b
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
2019-04-13 00:29:27 +02:00 |
|
omar
|
092426bed2
|
Docking: Hold Shift to force disable docking. (#2109)
|
2019-04-13 00:27:44 +02:00 |
|
omar
|
c6f1b7b92a
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
2019-04-13 00:27:44 +02:00 |
|
omar
|
30d81f53cb
|
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
|
2019-04-12 22:16:59 +02:00 |
|
omar
|
ee02cdbf03
|
Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)
|
2019-04-12 17:49:40 +02:00 |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-04-11 15:53:38 +02:00 |
|
omar
|
07a70dc972
|
Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.
|
2019-04-11 15:40:36 +02:00 |
|
omar
|
570d0bbbda
|
Demo: Comments, tweaks, removed some uses of ImColor helpers.
|
2019-04-11 15:23:54 +02:00 |
|
omar
|
f3110a57cd
|
Docking: Fixed an issue where newly created dock node override hosted window pos/size (#2109, #2386)
|
2019-04-11 14:51:01 +02:00 |
|
omar
|
b8fe0df7df
|
Examples: Null: Added Makefile.
|
2019-04-08 19:16:45 +02:00 |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
omar
|
1391904fd2
|
Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684, #2341)
|
2019-04-08 17:59:25 +02:00 |
|
omar
|
b53630813e
|
Internals: Tweak ItemSize calls. Added todo items.
|
2019-04-08 16:13:51 +02:00 |
|
omar
|
42423d5ea4
|
Examples: Makefile: Tweaks so they are more consistent with each others. Added -g./opt/local includes for MacPorts on Mac OS X. (#297)
|
2019-04-07 23:02:07 +02:00 |
|
omar
|
1295205cd4
|
Examples: Vulkan: Fixed warnings. (#2480)
|
2019-04-07 22:27:45 +02:00 |
|
omar
|
7056032483
|
Merge branch 'vulkan_fix_docking' into docking
|
2019-04-07 16:23:34 +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 |
|
omar
|
c43dab2414
|
Vulkan: Fix not incrementing semaphore index. (#2472, #2071)
|
2019-04-07 15:57:07 +02:00 |
|
omar
|
9c364b16ff
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
|
2019-04-05 20:30:42 +02:00 |
|
omar
|
e099a7dc74
|
Vulkan: Bits. Using IM_ALLOC/IM_FREE instead of new[] / delete[].
|
2019-04-05 20:27:46 +02:00 |
|
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.
|
2019-04-05 20:20:24 +02:00 |
|
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.
|
2019-04-05 20:20:08 +02:00 |
|
omar
|
d61caf5714
|
Vulkan, Viewports: ImGui_ImplVulkan_RenderDrawData and renderer back-end automatically manage ImGui_ImplVulkanH_WindowRenderBuffers for each viewports so user doesn't have to do it. (#2461, #2348, #2378, #2097)
|
2019-04-05 18:52:45 +02:00 |
|
omar
|
e70f866ed2
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking (WARNING: as is the validation layer will error on same vertex/index buffer being used for all frames)
# Conflicts:
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
|
2019-04-05 18:27:15 +02:00 |
|
omar
|
6bc47dfe48
|
Vulkan: Removed superfluous vkInstance parameters being passed along.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
452047c7ca
|
Vulkan: Removed requirement for user to pass their own render buffer storage to ImGui_ImplVulkan_RenderDrawData(), this is managed internally.
|
2019-04-05 18:24:28 +02:00 |
|
omar
|
ec76722d2d
|
Vulkan: Added ImageCount to InitInfo structure (!= MinImageCount) will be needed for viewports. Renamed FramesQueueSize -> ImageCount. (#2472, #2071)
|
2019-04-05 17:22:24 +02:00 |
|
MindSpunk
|
a45840746e
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 17:04:12 +02:00 |
|
MindSpunk
|
9acb158990
|
Vulkan, Viewports: Fix for resizing viewport windows crashing. (#2472)
|
2019-04-05 16:51:35 +02:00 |
|
omar
|
1ba79baab5
|
Vulkan, Viewports: Fixed ImGui_ImplVulkan_SetWindowSize() not recreating command-buffers, fence etc. (#2472, #2461, #2071)
|
2019-04-05 16:33:41 +02:00 |
|
omar
|
01de69de36
|
Vulkan: Note for unsupported feature with multi-viewports. (#2071)
|
2019-04-05 00:25:42 +02:00 |
|
omar
|
8ec24036d7
|
Vulkan: Viewports: Removed redundant field.
|
2019-04-05 00:01:25 +02:00 |
|
omar
|
29269d2aa8
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-04 23:55:33 +02:00 |
|
omar
|
0034e65c26
|
Vulkan: Renaming demo/helper structures. Tidying up examples main.cpp.
|
2019-04-04 23:40:28 +02:00 |
|
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)
|
2019-04-04 23:13:31 +02:00 |
|
omar
|
86f5945f49
|
Vulkan: Storing user info into a single g_VulkanInitInfo structure to simplify code.
|
2019-04-04 23:13:31 +02:00 |
|
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)
|
2019-04-04 22:27:29 +02:00 |
|
omar
|
6bf981c85c
|
Vulkan: More renaming. Comments.
|
2019-04-04 22:20:01 +02:00 |
|
omar
|
f586764cdd
|
Examples: Vulkan: Merged helpers into ImGui_ImplVulkanH_CreateWindowData. Removed ImGui_ImplVulkan_InvalidateFrameDeviceObjects from API. Comments. (#2071)
|
2019-04-04 22:12:16 +02:00 |
|
omar
|
54b8a65d9e
|
Examples: Vulkan: Renamed QueuedFramesCount to FramesQueueSize. Moved Framebuffer, Backbuffer to FrameData structure. (#2071)
|
2019-04-04 22:12:15 +02:00 |
|
omar
|
317859a3da
|
Examples: Vulkan: Updated Changelog, removed debug code, tweaked code, made GLFW/SDL match each others. Initialize FrameDataForRender fields. Added Assertion. Clearing fields on DestroyFrameData(). (#2071)
|
2019-04-04 22:11:13 +02:00 |
|
omar
|
c7eef99a33
|
Examples: Vulkan: Fixed tabs->space, removed extraneous braces and empty lines. (#2071)
|
2019-04-04 22:10:43 +02:00 |
|
MindSpunk
|
b88a3b2711
|
Examples: Vulkan: Added calls to supports runtime changing back buffer count. (#2071)
|
2019-04-04 22:10:43 +02:00 |
|
omar
|
43a85dd02e
|
Merge branch 'master' into docking
|
2019-04-04 22:10:18 +02:00 |
|