omar
|
f3a0b17bb8
|
Viewport: Win32, GLFW, SDL: Clarified back-ends by using global mouse position direction. GLFW: disabled io.MouseHoveredViewport setting under Mac/Linux. (#1542, #2117) + various comments.
|
6 years ago |
omar
|
3a678d48b1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
|
6 years ago |
omar
|
8d58055a54
|
Examples: DirectX10/11/12: Made imgui_impl_dx10/dx11/dx12.cpp link d3dcompiler.lib from the .cpp file to ease integration.
|
6 years ago |
omar
|
89a530b442
|
Somehow VS keeps modifying this GUID so I am going to playing along with it.
|
6 years ago |
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
|
6 years ago |
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).
|
6 years ago |
omar
|
48f6fdb349
|
Fixed typo.
|
6 years ago |
omar
|
7658035e5a
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
6 years ago |
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
|
6 years ago |
omar
|
a423f032ee
|
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
|
6 years ago |
omar
|
01f940dc9a
|
Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.
|
6 years ago |
omar
|
19c4fa8dd5
|
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
|
6 years ago |
omar
|
12a1e7d04e
|
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
|
6 years ago |
omar
|
5261e5a6ba
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
omar
|
35d648341b
|
Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. (#2187)
|
6 years ago |
omar
|
d8ab2c1ac9
|
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. (#1542) + todo
|
6 years ago |
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)
|
6 years ago |
omar
|
d87b80c6c1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
c00a3bd98f
|
Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. (#2181)
|
6 years ago |
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
|
6 years ago |
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
omar
|
f52f0a5277
|
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). (#2186)
|
6 years ago |
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
|
6 years ago |
omar
|
772354377b
|
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759)
|
6 years ago |
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
6 years ago |
omar
|
a419d46205
|
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)
|
6 years ago |
omar
|
131bf5ee4a
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
6 years ago |
omar
|
797f2044cd
|
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. (#2175)
|
6 years ago |
omar
|
5ea08394f5
|
Examples: SDL: Tweaked Windows instructions and batch files. (#2175)
|
6 years ago |
omar
|
9ee86f22b7
|
Examples: Win32: Handle UTf-8 in platform window title setting. (#2164)
|
6 years ago |
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
6 years ago |
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)
|
6 years ago |
Michał Janiszewski
|
2e6e1bec58
|
Examples: Add missing include guards (#2166)
|
6 years ago |
Cort
|
ed0f7004d0
|
Examples: Vulkan: Avoid unreferenced parameter warning. (#2162)
|
6 years ago |
Hui
|
e6db078eda
|
gladLoadGL() return 0 to indicate failure (#2157)
|
6 years ago |
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
ac9aaf4b6e
|
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
|
6 years ago |
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
Brandon
|
5f79a28a07
|
Examples: SDL: Fixed usage of SDL_GetDisplayDPI (#2137, #1676)
|
6 years ago |
omar
|
745f01022e
|
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133, #1929)
|
6 years ago |
Warren Moore
|
b4488d4f48
|
Examples: Downgraded Xcode project object version (50->48) to support Xcode 9.2 (last version supported on macOS 10.12) (#2133)
|
6 years ago |
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
hesiod
|
500a60debc
|
Examples: OpenGL3: Cast compile/link status to GLboolean (#2112, #2125)
Some OpenGL loaders/bindings do not allow comparisons between GLints and GLbooleans.
|
6 years ago |
omar
|
02afbaeef0
|
Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. (#2112) [@hesiod]
|
6 years ago |
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
6 years ago |
Michael Vetter
|
084c26aa41
|
Fix spacing in imgui_imp_sdl example (#2111)
|
6 years ago |
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
6 years ago |
omar
|
788febf044
|
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097)
|
6 years ago |
omar
|
7abc368927
|
Viewport: GLFW: Build fix for pre GLFW 3.2 (#1542)
|
6 years ago |
omar
|
7c3b9172ad
|
Examples: Referring to missing gamepad support in back-end that are missing it.
|
6 years ago |