e9c625a1dc
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
6 years ago
872477548b
Examples: Win32: Using IsChild() to be compatible with windows created within a parent. ( #1951 , #2087 , #2156 , #2232 )
6 years ago
14c40242db
Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. ( #2288 , #2290 )
6 years ago
882f1bc135
Examples: DirectX12: Targeting 10.0.14393.0 instead of 10.0.16299.0 (available on AppVeyor, and higher version doesn't seem necessary).
6 years ago
9391a97fbf
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
6 years ago
f435aa193b
Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
6 years ago
133f112af0
Examples: Win32: Using GetForegroundWindow() instead of GetActiveWindow() to be compatible with windows created in a different thread. ( #1951 , #2087 , #2156 , #2232 ) [many people]
6 years ago
5af930f97a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
6 years ago
4483320f0a
Examples: Allegro 5: Properly destroy all globals on shutdown. ( #2262 )
6 years ago
25ac85f15d
Examples: Downgrading projects to xcode 9.2 (maybe 8.0) ( #2134 )
...
* example_apple_opengl2: The deployment target was set to 10.12 from XCode 9.2.
* imgui_impl_metal: header not found by XCode 9.2.
* example_apple_metal: The deployment target was set to 10.12 from XCode 9.2.
6 years ago
0cabe4dedf
Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. ( #1542 )
6 years ago
cfcad42b89
Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. ( #1542 )
6 years ago
4a6f95acc8
Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
6 years ago
951c9dd68b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
d9a4cbc429
Examples: Comments about GLFW/SDL versions
6 years ago
a9a60a24c1
Tweaked asserts
6 years ago
a71d3c8cb3
Viewport: Misc comments following user feedbacks..
6 years ago
2889a14f86
Build fix for master.
6 years ago
9d0bc3f9ab
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
b1cd52b674
Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). ( #421 )
6 years ago
afe9c5c5f7
Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to 8dd83c5. ( #1542 , #2117 )
6 years ago
ee5560a958
Merge branch 'master' into viewport + added style tweak block when viewports are enabled
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
6 years ago
d5b22fb635
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
6 years ago
62cfdceac1
Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. ( #1542 )
6 years ago
8dd83c5fe8
Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. ( #1542 , #2117 )
6 years ago
5d20da1b36
Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. ( #1676 )
6 years ago
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
3a678d48b1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
6 years ago
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
89a530b442
Somehow VS keeps modifying this GUID so I am going to playing along with it.
6 years ago
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
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
48f6fdb349
Fixed typo.
6 years ago
7658035e5a
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
6 years ago
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
a423f032ee
About, IO: Added io.BackendPlatformName, io.BackendRendererName for informational/QA purpose.
6 years ago
01f940dc9a
Viewport: imgui_impl_sdl2: Added support for PlatformIO Platform_SetWindowAlpha.
6 years ago
19c4fa8dd5
Examples: DX12: Fixed compilation of imgui_impl_dx12.cpp in viewport branch. Multi-viewport is still not functional.
6 years ago
12a1e7d04e
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
6 years ago
5261e5a6ba
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
35d648341b
Examples: SDL: changed the signature of ImGui_ImplSDL2_ProcessEvent() to use a const SDL_Event*. ( #2187 )
6 years ago
d8ab2c1ac9
Viewport: Added support for minimized window which caused problem when ImGuiBackendFlags_HasMouseHoveredViewport was not supported. ( #1542 ) + todo
6 years ago
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
d87b80c6c1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
c00a3bd98f
Examples: SDL2+Vulkan: Fixed application shutdown which could deadlock on Linux + Xorg. ( #2181 )
6 years ago
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
dcbf976a8e
Merge branch 'master' into viewport + comments
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
f52f0a5277
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). ( #2186 )
6 years ago
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
772354377b
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. ( #1759 )
6 years ago
omar
Gilad Reich
DomRe
Alzathar