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
|
311469e9d6
|
Internals: Columns: Some renaming, extracted code into GetColumnsID().
|
2019-04-16 11:58:54 +02:00 |
|
omar
|
f70eacee8e
|
Docking: Internal: Added helper for automation to process docking at the mouse level.
|
2019-04-13 19:50:30 +02:00 |
|
omar
|
433a7556c7
|
Docking: Fixed another issue where the resulting node of a split would sometimes recall the pos/size of previous host window. Spent a whole day adding framework for testing more of docking so hopefully we'll heading toward the magical world of less regressions. (#2109)
|
2019-04-13 19:19:56 +02:00 |
|
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
|
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
|
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
|
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
|
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
|
9c364b16ff
|
Merge branch 'vulkan_fix_master' into vulkan_fix_docking
|
2019-04-05 20:30:42 +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
|
43a85dd02e
|
Merge branch 'master' into docking
|
2019-04-04 22:10:18 +02:00 |
|
omar
|
9ba64f9fe3
|
Viewport: Fixed PushClipRectFullScreen() missing out on negative coordinates. Among other things, the outer highlight during CTRL+Tab wouldn't appear in negative coordinates monitors. (~#2176, #1542)
|
2019-04-04 22:02:36 +02:00 |
|
omar
|
fc52364652
|
Tabs to Spaces, comments.
|
2019-04-03 17:25:02 +02:00 |
|
omar
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
2019-04-03 11:17:26 +02:00 |
|
omar
|
4a57507f75
|
InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336)
Not using isprint. + todo items.
|
2019-04-03 10:40:14 +02:00 |
|
omar
|
9bf6509c6e
|
Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. (#2109) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system (#2304)
|
2019-03-28 18:43:27 +01:00 |
|
omar
|
5af385ea78
|
Viewport: Renamed member + added note about a Docking issue with restoring focus.
|
2019-03-28 18:02:03 +01:00 |
|
omar
|
47219dd5c6
|
Docking: Remove code in BeginDocked() to set HiddenFramesCannotSkipItems based on upcoming tab bar selection, solely based on focus (might break something subtle?). Follow-up to c355ed1267. (#2453, #2109)
|
2019-03-28 16:13:06 +01:00 |
|
omar
|
b6ae8a0dca
|
Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). (#2453, #2109)
|
2019-03-28 16:11:50 +01:00 |
|
omar
|
a33d45d7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-03-28 15:48:25 +01:00 |
|
omar
|
9a0e71a6ec
|
Internals: Renamed the ImGuiWindow HiddenFrameXXX fields to decorrelate them from resizing behavior, as those values are set by other logic.
|
2019-03-28 15:41:49 +01:00 |
|
omar
|
5a665e423c
|
Docking: Added ImGuiDockNodeFlags_NoTabBar (not exposed publicly). (#2423, #2109)
|
2019-03-27 20:44:49 +01:00 |
|
omar
|
fc95da8aa3
|
Docking: Internals: Moved CentralNode and HiddenTabBar state into LocalFlags for consistency. (#2423, #2109)
|
2019-03-27 20:32:44 +01:00 |
|
omar
|
fd5859ed04
|
Docking: Separating SharedFlags vs LocalFlags in dock node so settings can be applied to individual nodes. Made _NoResize logic on single node applies as expected. (#2423, #2109)
|
2019-03-27 19:00:36 +01:00 |
|
omar
|
75e3793f4d
|
Docking: Fix DockBuilderAddNode() not storing flags when creating floating node.
|
2019-03-27 17:36:52 +01:00 |
|
omar
|
8d4b5fef1d
|
Renamed ImGuiDockNodeFlags_Dockspace to ImGuiDockNodeFlags_DockSpace for consistency. DockBuilderCopyDockspace() to DockBuilderCopyDockSpace(). Made casing consistent elsewhere. (#2109)
|
2019-03-27 17:36:52 +01:00 |
|
omar
|
04a9ce3a18
|
Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109)
|
2019-03-27 16:16:31 +01:00 |
|
omar
|
87883abd86
|
Docking: Tweak and silencing PVS studio static analyzer (back to zero warnings among our selected ones).
|
2019-03-26 14:15:56 +01:00 |
|
Tom Watson
|
f20725eada
|
Docking: Fixed an issue where windows docked into a node that's part of their dockspace wouldn't recover their order correctly after init. (#2109)
(It only worked on floating dock node for the accidental reason that BeginDocked would generally early out on the first frame)
|
2019-03-26 13:58:03 +01:00 |
|
omar
|
26646f2450
|
Docking: Wrapping tab bar creation/destroy to make it easier to debug them.
|
2019-03-26 12:41:50 +01:00 |
|
omar
|
f208fd7ebb
|
Docking: Fixed crash with ImGuiDockNodeFlags_AutoHideTabBar flag. (#2423, #2109)
|
2019-03-26 12:33:58 +01:00 |
|
omar
|
cf1b02e54e
|
Rearrange code in UpdateMouseWheel(). (#2424, #1463) + Fix old io.FontAllowUserScaling feature (probably should be made obsolete, but until then best fixed)
|
2019-03-25 19:40:19 +01:00 |
|
Luca Rood
|
1963cc59be
|
Implement horizontal scrolling with Shift+Scroll
This is standard scrolling behaviour in most applications.
|
2019-03-25 19:09:40 +01:00 |
|
omar
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2019-03-25 16:08:09 +01:00 |
|
omar
|
d9f6ba3035
|
IsWindowHovered() made change which should have no effect in master but fix result of IsWindowHovered(ImGuiHoveredFlags_ChildWindows) over multiple viewport in docking branch. (#2432)
|
2019-03-25 15:39:11 +01:00 |
|
omar
|
7a5196601e
|
Docking: BeginDocked() doesn't need to rely on tab bar data (will allow removing tab bar).
|
2019-03-18 09:48:06 -07:00 |
|
omar
|
c7619d4a6a
|
Docking: Preserve existing docked nodes when setting the ImGuiDockNodeFlags_NoDockingInCentralNode flag. (#2423, #2109)
|
2019-03-18 09:48:00 -07:00 |
|
omar
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
2019-03-17 00:56:21 +01:00 |
|