omar
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
2018-12-11 19:46:46 +01:00 |
|
omar
|
febc3e6aa1
|
Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
|
2018-12-11 19:19:12 +01:00 |
|
omar
|
d9a84de9d9
|
Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed.
|
2018-12-11 19:08:06 +01:00 |
|
omar
|
ccce47c6a2
|
Demo: Using Tabs in Style Editor and Simple Layout example. + Adding missing early out in About and Documents examples.
|
2018-12-11 18:10:43 +01:00 |
|
omar
|
067b691fd8
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2018-12-11 13:23:00 +01:00 |
|
omar
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-12-11 12:41:40 +01:00 |
|
omar
|
54a60aaa40
|
Added BETA api for Tab Bar/Tabs widgets. (#261, #351) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
|
2018-12-11 12:36:47 +01:00 |
|
omar
|
cc1283fb78
|
Added ImGuiWindowFlags_UnsavedDocument window flag to append '*' to title without altering the ID, as a convenience to avoid using the ### operator. (merged from Docking branch)
|
2018-12-11 12:20:48 +01:00 |
|
omar
|
e6439e1a16
|
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2018-12-10 16:21:49 +01:00 |
|
omar
|
26b9e2d0a5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2018-12-10 16:14:31 +01:00 |
|
omar
|
9476e07d5a
|
Added io.ConfigWindowsMoveFromTitleBarOnly option. Still is ignored by window with no title bars (often popups). This affects clamping window within the visible area: with this option enabled title bars need to be visible. (#899)
Tweaked default value of style.DisplayWindowPadding from (20,20) to (19,19) so the default style as a value which is the same as the title bar height.
|
2018-12-10 16:05:30 +01:00 |
|
omar
|
59f3c4fc20
|
Renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges and removed its [Beta] mark. Resizing windows from edge is now enabled by default (io.ConfigWindowsResizeFromEdges=true). Note that it only works _if_ the back-end sets ImGuiBackendFlags_HasMouseCursors, which the standard back-end do.
|
2018-12-10 15:41:01 +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
|
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
|
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
|
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
|
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
|
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 |
|