omar
e1143377c2
Viewport: Added ImGuiViewportFlags_NoFocusOnClick + support in imgui_impl_win32. Made windows with no decoration always set the _NoFocus flags. ( #1542 , #2117 )
...
Fix e.g. clicking on protruding combo box stealing highlight from parent window with decoration.
6 years ago
omar
13a5f5ba8b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
omar
ab9cd44c89
Examples: DirectX9: Fix Clang warning.
6 years ago
omar
0947fa3de0
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
omar
cb9a6b8a8b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/README.txt
# imgui.cpp
6 years ago
omar
54ba8a643e
Removed trailing spaces from text files. ( #2038 , #2299 )
6 years ago
omar
f94af2f5c5
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
6 years ago
omar
8079344cee
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
6 years ago
omar
259f3c78a2
Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. ( #2297 )
6 years ago
omar
2c38b32db1
Removed trailing spaces ( #2038 , #2299 )
6 years ago
omar
82e31d34f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
6 years ago
omar
295ada0364
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
6 years ago
omar
b8020032f9
Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. ( #2264 )
6 years ago
omar
acdb4823dd
Examples: Win32: Fix for older Windows SDK.
6 years ago
omar
b5144e477f
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
omar
e9c625a1dc
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
6 years ago
omar
872477548b
Examples: Win32: Using IsChild() to be compatible with windows created within a parent. ( #1951 , #2087 , #2156 , #2232 )
6 years ago
Gilad Reich
14c40242db
Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. ( #2288 , #2290 )
6 years ago
omar
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
omar
8a45c56c2c
Merge branch 'viewport' into docking
6 years ago
omar
9391a97fbf
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
6 years ago
omar
f435aa193b
Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled).
6 years ago
omar
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
omar
6b32570644
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
6 years ago
omar
5af930f97a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
6 years ago
DomRe
4483320f0a
Examples: Allegro 5: Properly destroy all globals on shutdown. ( #2262 )
6 years ago
Alzathar
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
omar
ce1626a51e
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
6 years ago
omar
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
omar
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
omar
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
omar
951c9dd68b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
omar
d9a4cbc429
Examples: Comments about GLFW/SDL versions
6 years ago
omar
a9a60a24c1
Tweaked asserts
6 years ago
omar
a71d3c8cb3
Viewport: Misc comments following user feedbacks..
6 years ago
omar
238321c159
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
6 years ago
omar
e181b0c3fc
Merge branch 'viewport' into docking
6 years ago
omar
2889a14f86
Build fix for master.
6 years ago
omar
9d0bc3f9ab
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
omar
b1cd52b674
Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). ( #421 )
6 years ago
omar
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
omar
81a2546cea
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
6 years ago
omar
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
omar
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
omar
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
omar
8dd83c5fe8
Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. ( #1542 , #2117 )
6 years ago
omar
088ef6623a
Merge branch 'viewport' into docking
6 years ago
omar
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
omar
e6439e1a16
Merge branch 'viewport' into docking + moved io.ConfigFlags ImGuiConfigFlags_DockingNoSplit to io.ConfigDockingNoSplit
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
6 years ago
omar
f768727284
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
6 years ago