omar
|
f768727284
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
2018-12-06 16:36:17 +01:00 |
|
omar
|
a03846bd9e
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-06 16:33:39 +01:00 |
|
omar
|
b58bd5b311
|
Version 1.67 WIP + todo notes
|
2018-12-04 13:49:29 +01:00 |
|
omar
|
5105c6c0d0
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2018-12-04 00:06:26 +01:00 |
|
omar
|
3a678d48b1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
|
2018-12-04 00:05:45 +01:00 |
|
omar
|
3e84f7cd1d
|
Viewport: Fixed a viewport bug which led some popups to merge in underlying host viewport when they should be z-over their parent viewport.
|
2018-12-03 18:16:47 +01:00 |
|
omar
|
8d58055a54
|
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
|
2018-12-03 17:47:10 +01:00 |
|
omar
|
10e13dd6bb
|
Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).
|
2018-12-03 12:19:23 +01:00 |
|
omar
|
ac10889bde
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2018-12-03 11:44:51 +01:00 |
|
omar
|
65e579e558
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
|
2018-12-03 11:41:53 +01:00 |
|
omar
|
801645d350
|
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
|
2018-12-03 10:17:17 +01:00 |
|
omar
|
34e18ef771
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
2018-11-30 23:48:39 +01:00 |
|
omar
|
8289e5f6b4
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
2018-11-30 23:48:25 +01:00 |
|
omar
|
84238240d6
|
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
|
2018-11-30 23:47:23 +01:00 |
|
omar
|
3849def253
|
Added ShowAboutWindow(), About Window now showing various config/build information.
|
2018-11-30 18:30:21 +01:00 |
|
omar
|
f78b5a0cdb
|
Merge branch 'viewport' into docking
|
2018-11-30 18:27:14 +01:00 |
|
omar
|
afeefadb4e
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
|
2018-11-30 18:24:43 +01:00 |
|
omar
|
4ef06f5aa2
|
Added ShowAboutWindow(), About Window now showing various config/build information.
|
2018-11-30 18:02:01 +01:00 |
|
omar
|
1bfcf8f339
|
Separator: Fixed Separator() outputting an extraneous empty line when captured into clipboard/text/file.
|
2018-11-30 16:42:32 +01:00 |
|
omar
|
753223bd7b
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-11-30 14:38:54 +01:00 |
|
omar
|
1c7be88a1a
|
Viewport: Fixed a bug where tooltips on their first frame didn't find a monitor leading to the "recovery" code to revert it to the main viewport for a frame. (#1542)
|
2018-11-30 14:35:13 +01:00 |
|
omar
|
baf67d393f
|
When the focused window become inactive don't restore focus to a window with the ImGuiWindowFlags_NoInputs flag. (#2213)
|
2018-11-29 23:25:29 +01:00 |
|
omar
|
4575354bc0
|
Docking: Comments + maiintain LastFrameFocused per node + using bitfiield for docking bools.
|
2018-11-27 13:29:09 +01:00 |
|
omar
|
d23c69d319
|
Docking: Added context menu option to hide the tab bar of single-window dock nodes, similar to Unreal. (#2109)
|
2018-11-26 17:25:06 +01:00 |
|
omar
|
ddc3f8f069
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2018-11-26 15:32:04 +01:00 |
|
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-11-26 14:53:51 +01:00 |
|
omar
|
35d648341b
|
Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. (#2187)
|
2018-11-23 18:12:37 +01:00 |
|
omar
|
d8ab2c1ac9
|
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542) + todo
|
2018-11-23 16:55:33 +01:00 |
|
omar
|
d27ffefbd4
|
Version 1.67 WIP
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
2515413080
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
|
2018-11-22 15:29:18 +01:00 |
|
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-11-22 15:28:27 +01:00 |
|
omar
|
da3c4330c1
|
Version 1.66
|
2018-11-22 15:11:52 +01:00 |
|
omar
|
c00a3bd98f
|
Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. (#2181)
|
2018-11-21 18:43:25 +01:00 |
|
omar
|
cc4b1f9e47
|
Nav: Fixed explicit directional input not re-highlighting current nav item if there is a single item in the window and highlight has been previously disabled by the mouse. (#787)
|
2018-11-21 16:07:04 +01:00 |
|
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
2018-11-15 14:00:01 +01:00 |
|
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-11-15 13:58:46 +01:00 |
|
omar
|
aa668c410a
|
Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. (#2168) + adding a else block to make NavCalcPreferredRefPos() more explicit.
|
2018-11-15 13:56:27 +01:00 |
|
omar
|
f52f0a5277
|
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). (#2186)
|
2018-11-13 18:54:02 +01:00 |
|
omar
|
5b1394c5ac
|
Update README.md
|
2018-11-09 15:02:19 +01:00 |
|
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
2018-11-08 16:56:51 +01:00 |
|
omar
|
772354377b
|
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759)
|
2018-11-08 16:24:41 +01:00 |
|
omar
|
a419d46205
|
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)
|
2018-11-08 15:14:09 +01:00 |
|
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
2018-11-06 09:52:38 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
omar
|
eb592bf7d3
|
ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. (#2173). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing.
|
2018-11-05 14:49:17 +01:00 |
|
omar
|
7fa3e71abb
|
Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155)
|
2018-10-30 10:48:21 +01:00 |
|
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
2018-10-25 23:45:19 +02:00 |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-25 23:41:13 +02:00 |
|
omar
|
eed1fba157
|
Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. (#2152)
|
2018-10-25 23:34:05 +02:00 |
|
Konstantin Podsvirov
|
faecf90383
|
SliderAngle: Added optional format argument to allow users customize precision and make localization. (#2150)
|
2018-10-25 22:29:29 +02:00 |
|
omar
|
12c72d2893
|
Fixed OpenGL texture loading example in comment + Discourse link to root of discourse
|
2018-10-25 21:32:29 +02:00 |
|
omar
|
a72d5ada61
|
Misc comments improvements
|
2018-10-25 19:02:43 +02:00 |
|
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:57:54 +02:00 |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-10-18 10:56:26 +02:00 |
|
omar
|
82873c7ad4
|
Update README.md
|
2018-10-18 10:44:14 +02:00 |
|
omar
|
5be915d6ab
|
Added ImGuiWindowFlags_NoMouseInputs which is basically the old ImGuiWindowFlags_NoInputs (essentially we have renamed ImGuiWindowFlags_NoInputs to ImGuiWindowFlags_NoMouseInputs). Made the new ImGuiWindowFlags_NoInputs encompass both NoMouseInputs+NoNav, which is consistent with its description. (#1660, #787)
|
2018-10-15 18:23:18 +02:00 |
|
omar
|
90b50bd4c3
|
Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. (#1660)
|
2018-10-15 18:16:49 +02:00 |
|
omar
|
8b956216b7
|
Demo: Testing return value of BeginTabBar() for consistency.
|
2018-10-15 17:19:52 +02:00 |
|
omar
|
b039dbc62e
|
Update README.md
|
2018-10-15 08:34:42 +02:00 |
|
omar
|
e6cc547a94
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
2018-10-12 15:51:31 +02:00 |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-10-12 15:50:48 +02:00 |
|
omar
|
ca753829cb
|
Revert using wchar_t functions (9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
|
2018-10-12 15:48:38 +02:00 |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
2018-10-12 13:01:20 +02:00 |
|
omar
|
9cf94d5dd6
|
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
|
2018-10-12 12:34:47 +02:00 |
|
omar
|
0fe48cbb61
|
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035, #2096)
Added misc/README file.
|
2018-10-12 11:16:51 +02:00 |
|
omar
|
cf0afb48ac
|
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
|
2018-10-11 12:53:10 +02:00 |
|
omar
|
d02b11dfbd
|
ImGuiTextBuffer: Avoid heap allocation when empty.
|
2018-10-11 12:08:09 +02:00 |
|
omar
|
3a7828de6b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
2018-10-09 18:35:45 +02:00 |
|
omar
|
7b3433c68b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
2018-10-09 18:33:39 +02:00 |
|
omar
|
84507cc744
|
Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)
|
2018-10-08 12:37:10 +02:00 |
|
omar
|
3fcc178c23
|
Update README.md
|
2018-10-08 11:37:13 +02:00 |
|
omar
|
dd748f0e39
|
Update README.md
|
2018-10-08 11:22:33 +02:00 |
|
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
2018-10-05 11:36:49 +02:00 |
|
omar
|
4e30698706
|
Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109)
|
2018-10-03 22:32:23 +02:00 |
|
omar
|
d348d86df4
|
Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109)
|
2018-10-03 17:50:07 +02:00 |
|
omar
|
bd82539ad5
|
Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109)
|
2018-10-03 14:42:47 +02:00 |
|
omar
|
83f55c9de5
|
Merge branch 'viewport' into docking
|
2018-10-02 18:55:48 +02:00 |
|
omar
|
33b88a0339
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-02 18:55:36 +02:00 |
|
omar
|
fbfe193fcd
|
Window, Inputs: Fixed resizing from edges when io.MousePos is not pixel-rounded by rounding mouse position input. (#2110)
|
2018-10-02 18:49:55 +02:00 |
|
omar
|
ae7f833c69
|
Window: Resizing from edges (with io.ConfigResizeWindowsFromEdges Beta flag) extends the hit region of root floating windows outside the window, making it easier to resize windows. Resize grips are also extended accordingly so there are no discontinuity when hovering between borders and corners. (#1495, #822, #2110)
|
2018-10-02 18:43:10 +02:00 |
|
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
2018-10-01 18:35:21 +02:00 |
|
omar
|
76e31bd51a
|
Fixed typo. (#2108, #2083)
|
2018-10-01 17:56:06 +02:00 |
|
omar
|
e623be998d
|
Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. (#143)
|
2018-10-01 15:53:18 +02:00 |
|
omar
|
b48ed9ebc0
|
Docking: Better tracking of current dock id for inactive and uncreated windows (in settings etc.). + Fixed assert when docking a single-visible leaf node of a hierarchy into another
|
2018-10-01 11:56:26 +02:00 |
|
omar
|
18ffb7dd86
|
Docking: Reworked DockContextPruneUnusedSettingsNodes() to prune entire unused trees.
|
2018-09-26 23:01:51 +02:00 |
|
omar
|
c6193d0605
|
Merge branch 'viewport' into docking
|
2018-09-26 21:35:09 +02:00 |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
omar
|
61d94ff88e
|
Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
|
2018-09-26 21:30:37 +02:00 |
|
omar
|
a7d3ae8937
|
BeginChild(): Fixed BeginChild(const char*, ...) variation erroneously not applying the ID stack to the provided string to uniquely identify the child window. This was undoing an intentional change introduced in 1.50 and broken in 1.60. (#1698, #894, #713) + reworked the Begin/BeginChild comments in imgui.h.
|
2018-09-26 21:24:42 +02:00 |
|
omar
|
dc92431328
|
Docking: Minor renaming. DockContextAddNode() uses 0 as marker for automatic ID selection + TODO update and moved docking entries to docs/TODO.txt
|
2018-09-26 12:58:14 +02:00 |
|
omar
|
5719b23e01
|
ImDrawList: Fixed AddConvexPolyFilled() undefined behavior when passing points_count smaller than 3, in particular, points_count==0 could lead to a memory stomp if the draw list was previously empty.
|
2018-09-21 10:00:26 +02:00 |
|
omar
|
3d318a6577
|
ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different.
Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.
|
2018-09-20 10:24:29 +02:00 |
|
Tesla Ice Zhang
|
4b353ce482
|
Fix file names (#2083)
|
2018-09-15 21:41:07 +02:00 |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-14 11:38:10 +02:00 |
|
omar
|
b85f345369
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
|
2018-09-14 11:32:55 +02:00 |
|
omar
|
c12da2a607
|
BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.
|
2018-09-14 11:28:08 +02:00 |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +02:00 |
|
omar
|
d014d0285a
|
DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. (#2024)
|
2018-09-11 11:15:06 +02:00 |
|
omar
|
af6cf25255
|
DragFloat: Fixed a situation where dragging with value rounding enabled or with a power curve erroneously wrapped the value to one of the min/max edge. (#2024, #708, #320, #2075).
|
2018-09-11 10:55:52 +02:00 |
|
omar
|
e2436ca625
|
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
|
2018-09-10 20:40:21 +02:00 |
|