omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2018-11-26 14:53:51 +01:00 |
|
omar
|
379733aba1
|
Viewport: Fix viewport regression with protruding child window creating their own viewport. (fixes cae4d02, 760c1d95) (#1542)
|
2018-11-26 14:53:04 +01:00 |
|
omar
|
131de7ab62
|
Docking: Added ImGuiConfigFlags_DockingNoSplit flag. (#2109)
|
2018-11-23 18:42:16 +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
|
862781b195
|
Viewport: Avoid unnecessary reapplying platform pos/size every frame. (#2205) + Fix GLFW ImGui_ImplGlfw_CreateWindow() from not applying position immediately. Clear LastNameHash properly (bug already fixed in Docking branch)
|
2018-11-23 16:35:17 +01:00 |
|
omar
|
cae4d020dc
|
Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. (#1542)
|
2018-11-22 21:18:14 +01:00 |
|
omar
|
1f78e08427
|
Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.
|
2018-11-22 21:16:43 +01:00 |
|
omar
|
760c1d95b9
|
Viewport: Merging/Extracting to/from main host viewport is now performed based on current state rather than triggers. Windows which don't fit in host window are now consistently in their own viewport. Toward simplifying the UpdateSelectWindowViewport() function. Probably broke something.. (#1542)
|
2018-11-22 21:13:07 +01:00 |
|
omar
|
510f0e505c
|
Viewport: UpdateTryMergeWindowIntoHostViewport() calls BringWindowToDisplayFront() - possible now that BringWindowToFocusFront() is a different function.
|
2018-11-22 20:13:55 +01:00 |
|
omar
|
0c4dee083c
|
Internals: Added ImPool helper data structure (used by testing system, and already in docking branch)
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
d27ffefbd4
|
Version 1.67 WIP
|
2018-11-22 18:59:57 +01:00 |
|
omar
|
d9c54826bb
|
Viewport: Stop relying on viewport->CreatedPlatformWindow to create Platform_DestroyWindow and Renderer_DestroyWindow. Explicitly require Platform_GetWindowFocus() to require supporting empty data.
|
2018-11-22 17:27:35 +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
|
a5cf227503
|
Added link to experimental imgui_scoped.h PR/thread (#2197, #2096)
|
2018-11-21 18:31:22 +01:00 |
|
omar
|
be66f94639
|
Examples: OpenGL3: More explicit testing for == GL_UPPER_LEFT in case glGetIntegerv(GL_CLIP_ORIGIN is not honored properly. (#2186, #2195) Fix f52f0a5277
|
2018-11-21 18:24:24 +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
|
b9ae9bb1e3
|
Internals: Using GetOverlayDrawList(ImGuiWindow*) to match syntax of viewport/master branches. Fixed compiling with IMGUI_DEBUG_NAV_RECTS
|
2018-11-21 15:37:29 +01:00 |
|
omar
|
50c43d1c8e
|
Removed unnecessary ImGui:: prefixes.
|
2018-11-15 16:43:05 +01:00 |
|
omar
|
6b4443755d
|
Internals: Added FindWindowByID() helper. (#2190)
|
2018-11-15 16:41:48 +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
|
f2d577c33f
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
2018-11-13 22:14:40 +01:00 |
|
omar
|
ae34241f8b
|
Viewport: BeginMainMenuBar(): explicitly set viewport to avoid creating new one when ImGuiConfigFlags_ViewportsNoMerge is set + misc shallow changes.
|
2018-11-13 22:11:39 +01:00 |
|
omar
|
1546153ca2
|
Docking: Fixed a regression where clicking a Tab wouldn't immediately set NavWindow. Which led to breaking the NavSaveLastChildNavWindow/NavRestoreLastChildNavWindow logic. (#2109)
|
2018-11-13 19:31:10 +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
|
19b4fcdacb
|
Made IsWindowFocused() work outside of NewFrame()-EndFrame() and added comments about how ImGuiFocusedFlags_AnyWindow should NOT be used in place of io.WantCaptureMouse. (#2185)
|
2018-11-13 11:23:15 +01:00 |
|
omar
|
5b1394c5ac
|
Update README.md
|
2018-11-09 15:02:19 +01:00 |
|
omar
|
6c1ae6cc71
|
Internals: DragBehavior: Added support for ImGuiDragFlags_Vertical to implement a vertical drag widget (no frontend function provided).
|
2018-11-09 14:41:40 +01:00 |
|
omar
|
6d7677534f
|
Internals: SliderBehavior: Using axis indexing.
|
2018-11-09 14:31:14 +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
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
2018-11-08 16:06:22 +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
|
131bf5ee4a
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
2018-11-06 09:51:21 +01:00 |
|
omar
|
797f2044cd
|
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175)
|
2018-11-06 09:51:09 +01:00 |
|
omar
|
5ea08394f5
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
2018-11-06 09:46:43 +01:00 |
|
omar
|
9ee86f22b7
|
Examples: Win32: Handle UTf-8 in platform window title setting. (#2164)
|
2018-11-05 17:37:06 +01:00 |
|
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
2018-11-05 17:29:31 +01:00 |
|
omar
|
f388216ff0
|
Examples: GLFW: VS2015 project link with legacy_stdio_definitions.lib in order to link with the precompiled VS2010 GLFW3.lib we provide. (#2010, #2043, #2091)
|
2018-11-05 17:28:09 +01:00 |
|
omar
|
c808eb92c6
|
Config: Added IMGUI_DISABLE_WIN32_FUNCTIONS to disable linking with _any_ Win32 function, as a general forward compatible measure.
|
2018-11-05 17:28:00 +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 |
|
Torkel Bjørnson-Langen
|
1441756a0f
|
Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() (#2153)
|
2018-11-05 14:17:51 +01:00 |
|
Michał Janiszewski
|
2e6e1bec58
|
Examples: Add missing include guards (#2166)
|
2018-11-01 20:56:36 +01:00 |
|
Cort
|
ed0f7004d0
|
Examples: Vulkan: Avoid unreferenced parameter warning. (#2162)
|
2018-10-30 21:15:30 +01:00 |
|