f366828dd2
Minor tweaks to reduce false positive of PVS Studio static analyzer.
6 years ago
f6fbb99a9c
Examples: SDL: Fix for Emscripten/Android/iOS on Docking branch.
6 years ago
7227454dca
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
6 years ago
03b0266b59
Examples: Made imgui_impl_win32 drag gdi32.lib for GetDeviceCaps(). ( #2327 )
6 years ago
5fc6899dc2
Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). ( #2329 ) [@BrutPitt]
6 years ago
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
13a5f5ba8b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
ab9cd44c89
Examples: DirectX9: Fix Clang warning.
6 years ago
0947fa3de0
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
cb9a6b8a8b
Merge branch 'master' into viewport
...
# Conflicts:
# examples/README.txt
# imgui.cpp
6 years ago
54ba8a643e
Removed trailing spaces from text files. ( #2038 , #2299 )
6 years ago
f94af2f5c5
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
6 years ago
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
259f3c78a2
Examples: OpenGL2: Added (yet another) comment/instruction against using opengl2 with modern OpenGL. ( #2297 )
6 years ago
2c38b32db1
Removed trailing spaces ( #2038 , #2299 )
6 years ago
82e31d34f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
6 years ago
295ada0364
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
6 years ago
b8020032f9
Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. ( #2264 )
6 years ago
acdb4823dd
Examples: Win32: Fix for older Windows SDK.
6 years ago
b5144e477f
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
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
8a45c56c2c
Merge branch 'viewport' into docking
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
6b32570644
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
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
ce1626a51e
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
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
238321c159
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
6 years ago
e181b0c3fc
Merge branch 'viewport' into docking
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
81a2546cea
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
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
088ef6623a
Merge branch 'viewport' into docking
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
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
f768727284
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
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
5105c6c0d0
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
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
ac10889bde
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
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
f78b5a0cdb
Merge branch 'viewport' into docking
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
b2e7a3806a
Examples: Allegro5: Add touchscreen support
6 years ago
3c114b280a
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
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
b8d9c5c130
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
12a1e7d04e
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
6 years ago
ddc3f8f069
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
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
2515413080
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
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
4a43f347bb
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
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
9d155c73bc
Examples: Misc comments mainly related to GLFW callbacks. ( #1759 )
6 years ago
a419d46205
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). ( #2178 )
6 years ago
565af90958
Merge branch 'viewport' into docking
6 years ago
131bf5ee4a
Examples: SDL: Tweaked Windows instructions and batch files. ( #2175 )
6 years ago
797f2044cd
Viewport: Fixed SDL+OpenGL2 example to work with multi-viewports. ( #2175 )
6 years ago
5ea08394f5
Examples: SDL: Tweaked Windows instructions and batch files. ( #2175 )
6 years ago
9ee86f22b7
Examples: Win32: Handle UTf-8 in platform window title setting. ( #2164 )
6 years ago
52ca91ca57
Merge branch 'master' into viewport
6 years ago
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
2e6e1bec58
Examples: Add missing include guards ( #2166 )
6 years ago
ed0f7004d0
Examples: Vulkan: Avoid unreferenced parameter warning. ( #2162 )
6 years ago
e6db078eda
gladLoadGL() return 0 to indicate failure ( #2157 )
6 years ago
168af9b377
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_demo.cpp
6 years ago
50f6e12d31
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
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
5f8c9ae0ef
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
056af2b1af
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
5f79a28a07
Examples: SDL: Fixed usage of SDL_GetDisplayDPI ( #2137 , #1676 )
6 years ago
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
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
e73217d6f7
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
c398153b40
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
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
02afbaeef0
Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. ( #2112 ) [@hesiod]
6 years ago
a3b0e0acfa
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. ( #2088 )
6 years ago
084c26aa41
Fix spacing in imgui_imp_sdl example ( #2111 )
6 years ago
2cff3f6a65
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
6 years ago
c6193d0605
Merge branch 'viewport' into docking
6 years ago
6cc380fc41
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
6 years ago
788febf044
Examples: Vulkan: Fixed some minor discrepency in the SDL+Vulkan example to match the Glfw+Vulkan example. (cc #2097 )
6 years ago
fda57f48d5
Merge branch 'viewport' into docking
...
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
6 years ago
7abc368927
Viewport: GLFW: Build fix for pre GLFW 3.2 ( #1542 )
6 years ago
7c3b9172ad
Examples: Referring to missing gamepad support in back-end that are missing it.
6 years ago
b57baa5ba0
Viewport: Enabled viewports by default in more example apps.
6 years ago
e32256b4b4
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
6 years ago
b85f345369
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
6 years ago
1afd29d382
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
6 years ago
9cc63ba279
Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. ( #2078 )
6 years ago
df65d4a14f
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
b872aa5c8e
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
6 years ago
7eadcf7d7d
example_glfw_vulkan was missing a reference to imgui_widgets.cpp ( #2071 , #2036 )
6 years ago
a82be53407
Merge branch 'docking2' into viewport_docking
...
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
6 years ago
49533bc86e
Examples: Enabled Docking + Nav by default in the branch. ( #351 )
6 years ago
bdb30d7145
Merge branch 'master' into viewport
6 years ago
f8b7e4d94f
Examples: imgui_impl_opengl3 Fix GLAD error condition ( #2059 , #2002 )
...
`gladLoadGL` returns 0 on fail, not the other way around.
6 years ago
fd201a90f1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
5d40d295b3
Comments, readme updates
6 years ago
be6ea86f8d
OSX: Added imgui_widgets.cpp to xcode project files.
6 years ago
e312363007
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly ( #2036 )
6 years ago
01586d33f3
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly ( #2036 )
6 years ago
36b2f64051
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
1b61b6b208
Examples: Vulkan: Minor tweaks.
6 years ago
b127027cbd
Examples: OpenGL: Added support for glew and glad OpenGL loaders out of the box. ( #2001 , #2002 ). Changelog, tweaks, applied changes to SDL+OpenGL3 example.
6 years ago
e476b7e727
WIP on configurable OpenGL loader. ( #2001 , #2002 )
6 years ago
705ff49400
Examples: Vulkan: Viewport: Tweak to improve framerate on multiple-viewport situations, tho it is still halving the unthrottled framerate on nvidia for some reason.. Followup to 4dea032 ( #1542 )
6 years ago
f81caac459
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
4dea0327e7
Examples: Vulkan: Fixed handling of VkSurfaceCapabilitiesKHR::maxImageCount = 0 case. Tweaked present mode selections.
6 years ago
0ada716184
Examples: Viewport: Disabling swap intervals / vsync on secondary context to match what the DX11 bindings is doing. ( #1542 )
6 years ago
a4191857c1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
6 years ago
7268c65d73
Examples: imgui_impl_vulkan: Comments (re)
6 years ago
3fdfac3377
Examples: imgui_impl_vulkan: Comments
6 years ago
5d630c930d
Viewport: DestroyPlatformWindows() checks for the bool CreatedPlatformWindow flag correctly. Note that we set CreatedPlatformWindow=true for the main viewport to allow the back-end to store data in the public Viewport structure (for consistency). ( #1542 )
6 years ago
e5f2295398
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
421dc19798
Examples: Cast to ImTextureID instead of void* when assigning to TexId. Applied to all examples. ( #2015 )
6 years ago
9c0805010f
imgui_impl_dx12: Cast to ImTextureID instead of void* to enable redefinition of ImTextureID ( #2015 , #301 )
6 years ago
d5793102db
imgui_impl_opengl3: Advertised as a ES2/ES3 renderer. Defaults to ES3 on Android. Default on "#version 300 es" on ES 3. ( #2002 , #1873 )
6 years ago
34203d5008
imgui_impl_win32: Don't redefine WIN32_LEAN_AND_MEAN if already defined ( #2014 )
6 years ago
e3eb4111cc
Examples: Fix 'How to build' instructions for SDL2 examples ( #2012 )
6 years ago
35124cdd07
imgui_impl_opengl3.cpp Using GLES3 on IOS instead of gl3w. ( #2002 , #1873 )
...
Not modifying the main.cpp yet because we need to test GL ES 3 context creation on iOS (only imgui_impl_opengl3.cpp was tested).
6 years ago
00e29832d4
Examples: OpenGL2: Disabling/restoring GL_LIGHTING and GL_COLOR_MATERIAL to increase compatibility with legacy OpenGL applications. ( #1996 )
6 years ago
8ef0ca9765
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
d69b2a1c1d
Changelog for #1989
6 years ago
6011ddf1e5
imgui_impl_dx11: Using ID3D11Factory instead of ID3D11Factory1 ( #1989 )
6 years ago
b1fc988c6b
imgui_impl_glfw, imgui_impl_sdl: Workaround for Emscripten which doesn't seem to handle focus related calls. ( #1941 )
6 years ago
b217251a63
Added Visual Studio 2017+ build cruft to Ignore List (.vs/ folder)
6 years ago
9824bf1ba1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
6 years ago
067edd09f9
imgui_impl_opengl3: Comments. ( #1987 )
6 years ago
81562b2b5a
Examples: imgui_impl_opengl3.cpp Using #ifdef GL_SAMPLER_BINDING instead of if (glBindSampler) ( #1985 )
6 years ago
faa7dad537
Examples: imgui_impl_osx: Fix for incorrect DeltaTime calculation on mac OS. ( #1978 )
6 years ago
544db70852
Examples: OpenGL3: Tweaks, added changelog. ( #1941 )
6 years ago
fc737d2333
Examples; imgui_impl_opengl3.cpp to work with Emscripten ( #1941 )
...
* Add some ifdefs to add emscripten specific params and includes
* Update imgui_impl_opengl3.cpp
* Update imgui_impl_opengl3.cpp
* Update imgui_impl_opengl3.cpp
* replace __EMSCRIPTEN_BUILD__ with __EMSCRIPTEN__
* replace GLFW_INCLUDE_ES3 with direct header
* removing useless glfw include
* Making call to glPolygonMode() optional
6 years ago
352695bc57
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
ff83d0e369
Examples: Using fully qualified "Dear ImGui" name in window titles.
6 years ago
d016ef1825
Examples: SDL: Removed SDL_HAS_WARP_MOUSE_GLOBAL in the non-viewport branch. ( #1954 ) (+1 squashed commits)
6 years ago
7b4fbf4301
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. ( #1542 )
6 years ago
ee98a069f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
6 years ago
73e13a0762
Examples: Tweaked the main.cpp example structure for all examples. (There are a few hidden agendas here: 1) I would like to avoid encouraging people from using the implicit "Debug" window, and promote using Begin/End. In spite of my best attempt, there are a few feature of the upcoming docking system that cannot work 100% properly for the implicit Debug window, so future proof let's not put that feature in the spotlight too much for new users. 2) Moved dumb hardcoded positions into a single spot that can be replaced with a viewport relative position and not affect other demo windows. 3) Calling ShowDemoWindow before anything else, also for the benefit of a specific docking demo which will have an ordering constraint which is not really problematic in a real app but shouldn't be put forward in the demo.
6 years ago
abe7b190dc
Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. ( #1944 )
6 years ago
88df66ec83
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
6 years ago
59fb3274a7
Examples: include for intptr_t on tdm-gcc + mingw32 ( #1936 ) + mouse buttons comments
6 years ago
fff014dfed
Examples: OpenGL3: Added shaders more versions of GLSL + made the example app default to GL 3.0 + GLSL 130 (instead of GL 3.2 + GLSL 150) unless on Mac. ( #1938 , #1900 , #1513 , #1466 , etc.)
6 years ago
de13261f1b
OpenGL3: Added error output when shaders fail to compile / link. ( #1938 )
6 years ago
14cef31467
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
6201cad2b4
Examples: Comments, Demo: Log early out, TODO. ( #1553 )
6 years ago
6277781e83
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
89e2ddf07f
Examples: Comments + shallow coding convention tweak to be consistent across examples and with imgui_impl_osx
6 years ago
569e0f07f1
Examples: Removed old example_apple/ + tweak comments ( #1873 )
6 years ago
839e4d34bd
Merge branch 'warrenm_osx'
6 years ago
c3f9220c15
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
6 years ago
d64157e803
Introduced a new Metal renderer implementation and a new example illustrating usage of Metal on macOS and iOS (partially addresses #1873 )
6 years ago
7b2662d245
Examples: Comments, bits of documentation
6 years ago
deb7aa29cd
OSX: Various tweaks to imgui_impl_osx courtesy of @warrenm + fix NewFrame position which has been moved recently master. ( #1873 )
6 years ago
0d7e779b37
Merge branch 'master' into osx
...
# Conflicts:
# examples/.gitignore
# examples/README.txt
6 years ago
a765c83bad
Ignore list: added emscripten output
6 years ago
770cba0bd0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
6 years ago
ddb09c6011
Examples: Ignore all *.user files ( #1919 )
...
For example `Qt Creator` create `CMakeLists.txt.user` file with user settings.
6 years ago
c4e34aaace
Examples: Comments to clarify how the keyboard data is indexed.
6 years ago
b62cc5c150
Fix include Example_glfw_vulkan cmake ( #1916 )
...
Probably got broken because of the refactor.
6 years ago
62b3d7c51e
Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. ( #1913 , #1914 )
6 years ago
ecd9a223e3
add hand cursor support (+11 squashed commit)
6 years ago
42a919f303
Examples: Apple: Fixed paths of GLFW+GL2 example. ( #1906 ) Update ignore list.
6 years ago
c38fe6b0e1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
a1ec7723ef
Examples: OpenGL3: Remove misleading or unnecessary "#version 150" strings.
6 years ago
20e89201cb
Examples: Fixes.
6 years ago
d3ee3e7ab5
Fixed merge.
6 years ago
ce500f8727
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
6 years ago
d68633398b
Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.
6 years ago
f9a5ff7a19
Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. ( #301 )
6 years ago
cac4c3f9b8
Examples: The functions in imgui_impl_xxx.cpp are prefixed with IMGUI_IMPL_API (which defaults to IMGUI_API) to facilitate some uses. ( #1888 ) + Comments in imgui.h
6 years ago
528b0b4af6
Examples: SDL+OpenGL2: Fixed Makefile. ( #1886 )
6 years ago
c44a4bed84
Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. ( #1887 )
6 years ago
2ce121b7d0
Readme, Links, Bindings
6 years ago
40845852b9
Fixed warnings + readme
6 years ago
a402edb66c
Examples: OSX: Added clipboard support. Fixed ignore list for xcode cruft. Comments about broken keys. ( #1873 )
6 years ago
9a5f742e63
Fixed merge.
6 years ago
70b0bd13aa
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
# imgui.h
6 years ago
185b4dde87
Examples: Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag. Added clipboard support. Unindexing buffers ourselves as Allegro indexed drawing primitives are buggy in the DirectX9 back-end.
6 years ago
087ab2acbf
Examples: Fixed example vcproj names in Viewport branch.
6 years ago
be4b8b5615
Internals: Added GetItemID(), GetFocusID() for consistency. Made GetActiveID() inline. Comments, fixed typos, demo tweaks.
6 years ago
24aeca3d0c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
6 years ago
e54b61aa0f
Examples: OSX: Fixed obsolete enums. Fixed keyboard mapping. Added missing keyboard modifiers. ( #1873 )
6 years ago
f96c7fac91
Examples: FreeGLUT: Fixed mapping of Space key. ( #801 )
6 years ago
cdf51cad2d
Comments, documentation
6 years ago
a1b6766d43
Examples: FreeGLUT: Added FreeGLUT bindings. Added FreeGLUT+OpenGL2 example. ( #801 )
6 years ago
bdb3d72d37
Examples: Win32: Fixed handling of mouse wheel messages to support finer position messages (typically sent by track-pads). ( #1874 )
6 years ago
7acb46bec5
Examples: Comments to make ImGuiConfigFlags_NoMouseCursorChange more visible ( #1027 ). + Allegro5: Added support for ImGuiConfigFlags_NoMouseCursorChange flag.
6 years ago
fac0c801da
Examples: Added imgui_impl_osx.mm bindings ( #1870 , #281 )
6 years ago
6f7b7807ad
Fixed Travis path + various paths in comments/documentations
6 years ago
9660657e95
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
5a13e4dcde
Examples: Renamed imgui_impl_sdl2.cpp to imgui_impl_sdl.cpp ( #1870 ) + changelog bits
6 years ago
8d58fbb5ed
Examples: Renamed example folders. ( #1870 )
6 years ago
13a3a2d0f3
Merge branch 'examples_refactor2' into viewport ( #1870 )
...
# Conflicts:
# examples/README.txt
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# 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_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl2.cpp
# examples/imgui_impl_sdl2.h
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
6 years ago
85f9694bd4
Big example binding refactor (manually imported from Viewport branch, stripped out of Viewport code). ( #1870 )
...
Read examples/README.txt for some details.
ImDrawData: Added DisplayPos, DisplaySize fields honored by all backends (not strictly necessary to honor just now, but doing it to be ahead)
6 years ago
24fc7c30dd
Examples: Documentation
6 years ago
06aa9d8d9a
Examples: Fixed Makefile, batch files.
6 years ago
8c374512fd
Examples, Platform: Removed the call to ImGui::NewFrame() from the platform _NewFrame() function e.g. ImGui_ImplWin32_NewFrame(), ImGui_ImplSDL2_NewFrame(), ImGui_ImplGlfw_NewFrame(), etc. Moved to main.cpp for consistency. ( #1542 )
6 years ago
77d51ebf24
Examples: Added .. folder in include path to remove the awkward #include "../imgui_impl_xxx.h" statements.
6 years ago
929522febe
Missing examples changelog bits and todo list
6 years ago
03c8a78f04
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
6 years ago
9770c8b21d
Examples: OpenGL3: Removed unnecessary backup/restore of GL_ELEMENT_ARRAY_BUFFER_BINDING since this is part of the VAO state. ( #1836 )
6 years ago
5fd23eeb74
Examples: iOS: Fixed missing call to CreateContext() + various shallow coding style tweaks. ( #1835 )
6 years ago
bef0a13283
Examples: Comments about GLSL version not being the same as GL context version. ( #1828 )
6 years ago
663e2c9237
Examples: GLFW: Made it possible to Shutdown/Init the backend again (by reseting the time storage properly). Changelog. Added to Vulkan example. ( #1827 )
6 years ago
e8a72d3e72
Examples: GLFW* Make subsequent window creation possible.
6 years ago
01429e7d16
Merge branch 'master' into viewport
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
6 years ago
19544629be
Examples: OpenGL3: Trying to make the call to glBindSampler optional to make the example code easier to use/share with different context version. ( #1806 )
6 years ago
85f3ba844c
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
7 years ago
090eb437ed
Viewport, Platform: Cleaned up xxx_UpdateMouseCursor() functions to make them more consistent. ( #1542 )
7 years ago
d574604a5d
Viewport, Platform: Win32: Fixed handling of io.WantSetMousePos + added a bunch of comments. GLFW, SDL2: Added handling of io.WantSetMousePos. ( #1542 )
7 years ago
6eacddb50f
Viewport: Changed Monitor field to use Pos+Size (more consistent), changed FullMin,FullMax to MainPos,MainSize. Made main viewport accessible in PlatformIO on first frame. Fixed casing of ImGuiViewportFlags_TopMost flag. ( #1542 )
7 years ago
39f4761ff7
TODO list update + Changelog and comments for #1803 .
7 years ago
895647a240
Fixed clipboard paste memory leak in SDL examples. ( #1803 )
7 years ago
4ff23d3306
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
7 years ago
4310bad32a
Examples: DirectX9: Comments, updated changelog, notes about usage of imconfig.h ( #1790 , #1687 )
7 years ago
d0051ce5cb
add renderstate D3DRS_SHADEMODE for Dx9 impl
...
add backuping transform for Dx9 impl
(#1790 , #1687 )
7 years ago
cd51f37fc0
Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. ( #1542 )
7 years ago
da70c837da
Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. ( #1542 )
7 years ago
eb1c36fdfb
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. ( #1695 , #1769 )
7 years ago
3b9b1956cd
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
7 years ago
7a41e0b1ea
Platform: Added platform_io.Platform_SetWindowFocus, Platform_GetWindowFocus function wrappers (unused yet). Exact specs tbd because our simplified concept of focus doesn't necessary match the more complex OS native concepts. ( #1542 )
7 years ago
e3e4b7bdf5
Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. ( #1542 )
...
Platform: Clarifying some comments in back-ends.
7 years ago
cb78e62df9
Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok. ( #1542 )
...
SDL2 ime support under Win32 never worked properly because of SDL interferences.
7 years ago
376f2aec54
Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the beginning of the list. ( #1542 )
7 years ago
d268471285
Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.
7 years ago
423577e14e
Viewport, Platforms: SDL: Fixed initial focus click being ignored as a mouse button. GLFW: Fixed mouse cursor support for multi-viewport with GLFW 3.3 (current master) - somehow doesn't appear to work with GLFW 3.2 but I'm not too fussed about it. ( #1542 )
7 years ago
4433ce4312
Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. ( #1542 )
7 years ago
456bbffcc4
Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. ( #1542 )
7 years ago
17a7f352b5
Viewporrt. Examples: DirectX10,11: Make the platform SetWindowSize handler not crash on failure to resize, which could happen (rarely) on invalid data or bug in the code.
7 years ago
637d9c42bf
Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. ( #1542 )
7 years ago
bcac02809f
Examples: Allegro 5: Renamed bindings from imgui_impl_a5.cpp to imgui_impl_allegro5.cpp.
7 years ago
3913297384
Examples: Allegro 5: Added support for 32-bit indices setup via defining ImDrawIdx, to avoid an unecessary conversion (Allegro 5 doesn't support 16-bit indices).
7 years ago
1c385c2ca4
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui_internal.h
7 years ago
83d97d4a9b
Fix typos KeyDown => KeysDown
7 years ago
950539b768
Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. ( #1542 , #1676 )
7 years ago
22d6f00110
Viewport: Fixed DPI changing viewport from interfering with moving another window (disabling code) + metrics crash fix on closed viewport window + Windows 10 call to SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) for DPI, with no noticeable improvements. ( #1542 , #1676 )
7 years ago
285269ef55
Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. ( #1542 )
7 years ago
83bd3595a4
Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. ( #1542 )
7 years ago
32ee0a3947
Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. ( #1542 )
7 years ago
7ddc22b326
Viewports, DPI: Renamed config flags. ( #1542 )
7 years ago
0d5042f0f3
Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. ( #1542 )
7 years ago
d4dd448511
Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
7 years ago
56ad2a2d74
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/vulkan_example/main.cpp
# imgui.h
7 years ago
660c157880
Examples: Added missing calls for ::DestroyWindow, glfwDestroyWindow() + fix old comments.
7 years ago
54fca1d1b8
Fixed erroneous call to io.Fonts->ClearInputData() + ClearTexData() that was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes 6cee2fca94) ( #1733 , ~#1731) + assert
7 years ago
f421e73b40
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
72b7f48870
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. ( #787 , #1495 , #1202 ) + comments
7 years ago
72899318e6
Viewport, Platform, Examples: Added support for transparent window via PlatformIO Platform_SetWindowAlpha ( #1542 ) + fixes for GLFW 3.3
7 years ago
84c6ea0cee
Viewport: Comments about honoring ImGuiViewportFlags_NoInputs and MouseHoveredViewport. ( #1542 )
7 years ago
9d8bc79025
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. ( #1542 )
7 years ago
0cad274b87
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
7 years ago
664ab85f76
Examples: Tweak comments. ( #1704 , #1708 ).
7 years ago
ca39070ca0
Examples: Win32: Fixes for MingW which doesn't support a 2007 define? I have no idea why people still use MingW ( #1704 , #1463 )
7 years ago
cd602b8832
Examples: SDL: Note about SDL breaking the IME under Windows (I can't seem a way SDL2 Windows IME implementation can possibly work, the functions are never called/referenced).
7 years ago
200754b013
Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. ( #1202 ) [@PhilCK]
7 years ago
94116f1143
Examples: GLFW: Don't alter cursor mode if GLFW_CURSOR input mode is GLFW_CURSOR_DISABLED. ( #1202 ) [@PhilCK]
7 years ago
42ad3c1dd3
Examples: OpenGL2: Added multi-viewport support in the OpenGL2 back-end. ( #1542 ) + Metrics: Fix undisplayed flag.
7 years ago
172570acae
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
7 years ago
75c3793db5
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. ( #787 , #1495 , #1202 )
7 years ago
dcf7c3d188
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. ( #787 , #1542 )
7 years ago
170f44e6f0
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming ( #787 )
7 years ago
c29971cf72
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
7 years ago
74b7dce394
Examples: Renamed applications to emphasis on use of GLFW as a platform framework + minor local tweaks
7 years ago
4485e56e02
Examples: Vulkan: Fix missing subpass dependency
...
Without a dependency between pWaitDstStageMask (COLOR_ATTACHMENT_OUTPUT)
and the render-pass, the UNDEFINED -> COLOR_ATTACHMENT_OPTIMAL transition
might happen before the image is ready to be used.
7 years ago
a73f6d06e0
Examples: Vulkan: Using VK_PRESENT_MODE_MAILBOX_KHR. Disable IMGUI_UNLIMITED_FRAME_RATE by default. Fixed warnings. ( #1042 )
7 years ago
2fecd332fc
Viewport, Platform: Added void* to render/swap buffer functions. Comments. ( #1542 , #1042 )
7 years ago
0e09032750
Viewport, Examples: Renamed types used by examples. ( #1542 )
7 years ago
46b61427e1
Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. ( #1542 , #1042 )
7 years ago
1ab236d9df
Viewport, Platform: Internal renaming to use more consistent (OsDesktopPos > PlatformPos). ( #1542 )
7 years ago
2e1ac0f683
Viewport, Platform: SDL: Makes the CreateViewport function restore current GL context so in theory it is free from side-effect. That said, it seems like there is a bug in SDL because our CreateViewport (currently in Render(), not for long) have affect a jerky side-effect if SDL_GL_MakeCurrent() is called before Render(). ( #1542 )
7 years ago
8364d1ca6c
Viewport: Removed back-end renderer code that implied we need to clear with WindowBg color. Added NoRendererClear flag. ( #1542 , #1042 )
7 years ago
09d8943967
Examples Refactor: GLFW: Explicit functions to init GLFW with OpenGL or Vulkan since we cannot read the api hints from glfw.
7 years ago
6e58a95a01
Viewport, Platform, Examples: Changes to resizing flow + restored support for Platform events affecting the ImGui windows (so Decorated windows are functional). ( #1542 , #1042 ) ..
...
SDL: Added platform move/resize/close support.
GLFW: Added platform move/resize support. Moved Close to use callback for consistency.
Win32:
Vulkan: Fixed resize support.
Naming is WIP "PlatforrmRequestXXX" is too ambiguous. Basically we either have a ImGui->Platform flow or a Platform->ImGui flow. Working a bigger refactor now.
7 years ago
83ef61fa56
Examples: SDL: Fix for versions olders than 2.0.6
7 years ago
d0e0b106f0
Examples: SDL,GLFW,Vulkan: The Platform<>Renderer link is handled by SDL/GLFW platforms, both can compile without Vulkan headers, SDL+Vulkan is now on part with GLFW+Vulkan (aka broken the same way!). ( #1542 )
7 years ago
98b66a5fc9
Examples: Using draw_data->DisplaySize, followup to c50198debe. Fix Vulkan secondary viewport rendering. SDL+Vulkan: Matched changes. Fix vcprojs. ( #1542 , #1042 )
7 years ago
c50198debe
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize ( #1542 ) wip
7 years ago
b88492746e
Examples, Viewport: Vulkan: Experiment (broken) multi-viewport support, merging code from ParticlePeter branches. ( #1542 , #1042 )
7 years ago
f6fc28dfd2
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042 )
7 years ago
cdeef65b05
Examples: Vulkan: Passing Queue, QueueFamily to binding. Fixed scissor (fixed in master). ImGui_ImplVulkanH_DestroyWindowData() waits for device to be idle. ( #1042 )
7 years ago
1e81a53e75
Examples: DPI: Minor warning fix. ( #1676 )
7 years ago
37cb177745
Examples: Vulkan: Only resize swap chain and framebuffer once. ( #1042 )
7 years ago
1c18d65313
Examples: Renamed glfw error callback for clarity.
7 years ago
b2453d7e8f
Fixed resize window validation errors with removing frame prerender once and present last but one frame functionality. Frame rate is still similar.
7 years ago
5e63711084
Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. ( #1542 , #1676 )
7 years ago
a2fbcc9ad4
Examples: DPI: Portable DPI related helpers in the _Win32 examples. Using one in examples's main.cpp, the GetDpiScale functions are not wired anywhere for now. ( #1542 , #1676 )
7 years ago
1eb89d7e3b
Viewport: Changed signature of ResizeViewport to be consistent with other similar functions.
7 years ago
4d46383100
Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). ( #1542 )
7 years ago
aa3fe81c87
Examples: DPI: Hacked in a quick compile-and-run-everywhere call to SetProcessDpiAwareness(), will need to revisit.
7 years ago
9ea16e344a
Viewport: Disable extra viewports from hosting other windows. ( #1542 )
7 years ago
d8719cf59b
Fixed warnings.
7 years ago
9dcc07422e
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. ( #1542 )
7 years ago
52c78820aa
Examples: SDL: Fix for pre 2.0.4.
7 years ago
19b92751b9
Examples: Updated Makefile and batch files to work with new examples. Using lowercase "gl.h" as it seems this is what Linux wants.
7 years ago
f318f2d5ea
Examples: Added Makefile for SDL+OpenGL2 example. ( #1668 )
7 years ago
7fd62baa42
Examples: Added Makefile for SDL+OpenGL2 example. ( #1668 )
7 years ago
3637193556
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.h
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
7 years ago
a2ed3ee2cf
Examples: OpenGL3: Added a way to override the glsl version number through the Init call. ( #1667 , #1466 )
7 years ago
c4a158656e
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/directx9_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_vulkan.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
7 years ago
e026c8d3b7
Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. ( #1542 )
7 years ago
cab41d954e
Examples: Vulkan: Further refactor.
7 years ago
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
e0cbfd74d7
Examples: Vulkan: Moved CreateOrResizeWindowData func to imgui_impl_vulkan.h
7 years ago
426930e028
Examples: Vulkan: Moved main.cpp data structures to imgui_impl_vulkan.h as shared helpers for the benefit of both the example and the platform/viewport renderer interface.
7 years ago
e9fa17e1bf
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). ( #1542 )
7 years ago
7113fc7dee
Examples: Vulkan: Moved variables into per-window data, refactored/tweaks to that the bug functions main.cpp for both SDL and GLFW examples match (they'll probably be moved to imgui_impl_vulkan as helpers).
7 years ago
e0f283cfcb
Examples: Vulkan: Fix 7b968b098e
7 years ago
7b968b098e
Examples: Vulkan: Reduced duplicate code by skipping present on the first frame. Amend 201d589714 by @ParticlePeter
7 years ago
e927a6ac4a
Examples: Vulkan: Various tweak. Misc refactor into per-frame data. Duplicate buffer creation code moved to CreateOrResizeBuffer().
7 years ago
9da475e4e8
Examples: GLFW, Vulkan: GLFW binding viewport tweaks to supports Vulkan better (do not call SwapBuffer, share context etc.). Added DUMMY (empty) platform/viewport interface in the viewport code.
7 years ago
5b282bdd48
Examples: Renamed glfw error callback so it's more clear what it is.
7 years ago
fc80f2b41a
Merge branch 'examples_refactor' into viewport
...
# Conflicts:
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/sdl_vulkan_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.h
7 years ago
68e9ef9885
Examples: Vulkan: SDL: Fixed missing resize handler (not properly merged from #1367 ) + tweaks.
7 years ago
296db2ed33
Examples: Vulkan: Moved code into shared helpers: ImGui_ImplVulkan_SelectSurfaceFormat, ImGui_ImplVulkan_SelectPresentMode.
7 years ago
3171d61dfc
Examples: Vulkan: Various tweaks to name variable more consistently like Vulkan + a few comments + a few imgui style code compaction.
7 years ago
57e9f61852
Examples: Vulkan: Debug report tweak + always enable in Debug build.
7 years ago
cf365ed00b
Examples: Fixed enabling IMGUI_VULKAN_DEBUG_REPORT which was broken during refactor because of duplicate 'extensions' local variable.
7 years ago
b37ef20c5c
Makefile: updated sdl_opengl3_example with all changes from #885 .
7 years ago
124d8522b1
Do not store compiled objects outside the project tree.
7 years ago
b6f251103b
Define SOURCES instead of OBJS in Makefiles.
...
OBJS is still deduced from SOURCES, but this change gives better control
over where the object files get actually written.
7 years ago
d4f63c3844
Use make variables $@ and $^ where appropriate.
7 years ago
551932697d
Ensure `make clean` is idempotent.
...
Prior to this, `make clean` would fail if the project was not already
fully built, and a second invokation would always fail.
7 years ago
d98a5d54aa
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
8074d56bdd
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
fc3c3de70d
Examples: DX10: Multi viewport/platform support (based on DX11 version). ( #1542 )
7 years ago
997d1bd0eb
Examples: NULL pointers for consistency.
7 years ago
baef79415b
Examples: DX12: Empty skeleton toward implementing the multi-viewport api for DirectX12. (WIP/test API) ( #1542 , #301 )
7 years ago
cb601d79e8
Examples: SDL: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
...
ImGui_ImplSDL2_Init() now takes a SDL GL context.
7 years ago
4cee46f909
Examples: GLFW + OpenGL3: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
7 years ago
25349b31d7
Examples: DX11 + Win32: Initial attempt at implementing the viewport/platform api. (WIP/test API) ( #1542 )
7 years ago
29510fcb83
Examples: Misc tweaks/fixes.
7 years ago
3f335b0d42
Merge branch 'master' into examples_refactor
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
d7f97922b8
Examples: Fix d749d49903 missing the deletion code. ( #1217 )
7 years ago
d749d49903
Examples: OpenGL3: Create the VAO in the render function so the setup can more easily be used with multiple shared GL context. ( #1217 )
7 years ago
ffda84cfae
Examples: DirectX12: Merged to new example format, imgui_impl_dx12.cpp contains the DX12 stuff, couple with imgui_impl_win32.cpp
7 years ago
e6bc840f6f
Merge branch 'master' into examples_refactor
7 years ago
288351a801
Examples: DirectX12: Tweaked assertion to more accurately represent what it wants to say. ( #301 )
7 years ago
63be3e7c82
Update README.txt
7 years ago
7e24ce0956
Examples: DirectX12: Fixed shutdown issue. ( #301 )
7 years ago
9be7d048c8
Examples: DirectX12: Merge, various styling tweaks, update for 1.60 wip, synchronized Win32 features with other examples. ( #301 )
7 years ago
913f3692a2
Examples: DirectX12: Removed from current solution which is meant to be VS2010 compatible for now (will change soon).
7 years ago
0d063585e8
Merge branch 'jdm3_master'
7 years ago
f43068c543
Examples: DirectX10, DirectX11: Simplified main example code.
7 years ago
0b26387a2b
Simplified .gitignore list
7 years ago
493ec0bc98
Simplified .gitignore list
7 years ago
f7ef10e547
Examples: Titles/comments in headers
7 years ago
91cadc1130
Merge branch 'master' into examples_refactor
7 years ago
9b9d9321cf
Examples: SDL: Using %SDL2_DIR% in the .vcproj instead of %SDL_DIR%, the earlier is more standard.
7 years ago
47d1360124
Examples: Using SDL2_DIR instead of SDL_DIR (more standard).
7 years ago
f67699456c
Examples: Added SDL+Vulkan example, the abstraction worked here :) (ref #1367 )
7 years ago
387f724d33
Examples: Vulkan: Formatting and tweaks (to match SDL's main).
7 years ago
bcdfd5d61c
Merge branch 'master' into examples_refactor
7 years ago
9c20a40b36
Examples: OpenGL: Cast call to glPolygonMode(). ( #1628 ).
7 years ago
daddd09cd5
Examples: Mouse cursor handling comments/tweaks to homogenize. ( #1495 )
7 years ago
d534207622
Examples: GLFW: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
7 years ago
11b12488e8
Examples: GLFW*: Renamed GLFW callbacks exposed in .h to not include GL2/GL3/Vulkan in their name.
7 years ago
7e2e0535dd
Examples: DirectX 9,10,11: Inputs: Added support for mouse cursors (ImGui::GetMouseCursor() value and WM_SETCURSOR message handling). ( #1495 )
7 years ago
e660d92fa5
Examples: GLFW: Added mouse cursors support ( #1495 )
7 years ago
9fdf72e42b
Examples: WIn32: Prefixing every Win32 function calls with :: to denote global namespace in a consistent manner.
7 years ago
df9051ded2
Examples: Vulkan: Added support for io.DisplayPos.
7 years ago
230c5ca735
Examples: Vulkan: Fixed GLFW calls.
7 years ago
3bd3693fb7
Examples: DirectX10, DirectX11, OpenGL2, OpenGL3: Added support for io.DisplayPos.
7 years ago
6d0f9244b8
Examples: Allegro5, Marmalade: Moved bindings to parent folder. Renamed Allegro stuff from *A5_ to *Allegro5_
7 years ago
80a8aea7e3
Examples: Added SDL, Vulkan examples to .sln file.
7 years ago
4f0db01f7c
Examples: DirectX9: Reusing imgui_impl_win32, removed that code from imgui_impl_dx9
7 years ago
6cd4e30b58
Examples: DirectX10: Reusing imgui_impl_win32, removed that code from imgui_impl_dx10
7 years ago
19540479d4
Examples: DirectX11: Extracted imgui_impl_dx11.* instead imgui_impl_dx11 and imgui_impl_win32
7 years ago
90dffb5a06
Examples: Vulkan: Extracted into imgui_impl_vulkan.*, reused imgui_impl_glfw* files.
7 years ago
ef521d1e0b
Examples: SDL: Extracted into imgui_impl_sdl.*, reused imgui_impl_opengl* files.
7 years ago
42c32bf00c
Examples: OpenGL2, OpenGL3: Added glPixelStorei() calls borrowed from SDL examples.
7 years ago
c8a9969511
Examples: GLFW+GL2: Moved glfw, gl2 files to root folder, split imgui_impl_glfw_gl2 into _opengl2 and reused imgui_impl_glfw
7 years ago
b0a8734c92
Examples: GLFW+GL3: Split imgui_impl_glfw_gl3 into imgui_impl_glfw and imgui_impl_gl3 (wip)
7 years ago
f5f3730b16
Examples: GLFW+GL2/GL3: Added glPixelStorei() calls borrowed from SDL examples.
7 years ago
9e713b115f
Examples: Renamed .sln file.
7 years ago
243fd67b1c
Examples: Vulkan: Fix for empty draw data (init time) + fixed warning.
7 years ago
10752423ec
Examples: Vulkan: Added .vcproj files.
7 years ago
31158e575f
Examples: SDL: Fixed minor warning.
7 years ago
00b24f27c2
Examples: SDL: Added .vcproj files.
7 years ago
03a44acf6f
Examples: SDL: Minor stylistic tweaks. Fixed handling of ImGuiMouseCursor_None so it doesn't underflow array. Fixed harmless uninitialized pointer. ( #1626 )
7 years ago
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
7 years ago
ffb6e89f30
Use SDL system cursors in SDL examples. ( #1626 )
...
(Squashed 4 commits)
7 years ago
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
7 years ago
0cefd40888
Examples: Added Changelog to make updates easier.
7 years ago
41ecebff5a
Examples: SDL: Added Changelog at the top of the imgui_impl files. ( #1618 )
7 years ago
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
7 years ago
2493f609ef
Examples: Vulkan: Fix (something changed in GLFW not including vulkan.h, was unwillingly relying on that)
7 years ago
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
7 years ago
ae30efc0fd
Nav: Examples: Added commented out io.NavFlags |= ImGuiNavFlags_EnableKeyboard to all examples. ( #787 )
7 years ago
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
7 years ago
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
7 years ago
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
7 years ago
cea8017e0b
Merge branch 'master' into context
7 years ago
4b49f03a40
Examples: SDL+GL3: Added Navigation keyboard mapping. ( #787 )
7 years ago
7e1496e994
Merge branch 'master' into navigation
7 years ago
fcf1c9d151
Examples: SDL: Using SDL_GetPerformanceCounter() / SDL_GetPerformanceFrequency() to handle framerate over 1000 fps properly. Noticed bad inputs artefacts in Nav branch at 2000 fps without this. ( #996 )
7 years ago
60fb7d31fd
Examples: SDL2: Enabling vsync. Using scancode consistently, fixed keyboard weirdness.
7 years ago
73d493c780
Examples: Organized header files to make available features more visible.
7 years ago
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
4786321754
Fix iOS code; fixes entire XCode build for Apple example
7 years ago
27980d9688
Merge branch 'master' into context
7 years ago
47e81a6194
Merge branch 'master' into navigation
7 years ago
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
7 years ago
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
6c38aa2dc7
Examples: Apple: Tweak code and sync with other examples better (untested).
7 years ago
cca9c3e3da
Examples: Using Dark theme by default. ( #707 ). Tweaked demo code.
7 years ago
955d86199f
Examples: Tweaks formatting.
7 years ago
2933e6765c
Merge branch 'master' into navigation
7 years ago
6a25a8720a
Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.
7 years ago
91d77be36e
Examples: Makefile leave CXX alone, instead leave commented out options. (nb: codeship doesn't seem have clang++)
7 years ago
3cdd2096ec
Examples: Use Clang in old Makefile.
7 years ago
ddff378daf
Examples: Synced Makefile comments. Added build/ folder into git ignore list/
7 years ago
858d75ab59
Examples: Apple: Fixed filenames in OSX xcode project.
7 years ago
66d5712a8a
Examples: Vulkan: FIxed warnings in 32-bit modes (vulkan uses VkDeviceSize which is always 64-bit long)
7 years ago
3ded262776
Merge branch 'master' into navigation
7 years ago
827f4b17d3
Nav: Examples: Glfw+GL3: Added basic gamepad mapping code when io.NavFlags & ImGuiNavFlags_EnableGamepad is set. (will iterate/tweak before spreading to other examples). ( #787 )
7 years ago
3967ff58b2
Nav: Examples: DirectX11, Glfw+GL3: Basic code to map keyboard inputs when io.NavFlags & ImGuiNavFlags_EnableKeyboard is set. (will iterate/tweak before spreading to other examples). ( #787 )
7 years ago
94ed44b5cb
Fix allegro5_example build instructions
7 years ago
c226e02ca0
Fix sdl_opengl2_example filename in README.md's build instructions
7 years ago
2c7324da56
TODO list, added uSynergy README
7 years ago
f3776055d6
Merge branch 'master' into context
7 years ago
8c57d8cc1e
Natvis: Fix ImRect expanded height display being broken and dumb. ( #1569 )
7 years ago
6f27d6b5b8
Natvis: Made ImGuiWindow display shorter.
7 years ago
c2e92ab61b
Added imgui.natvis helper for visual studio users. Added to examples projects.
7 years ago
277f6e7842
Examples: Comments
7 years ago
dd89c9ea59
Examples: Made the Win32 proc handlers not assert if there is no active context yet, to be more flexible with creation order. ( #1565 )
7 years ago
d3e826c247
Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
7e7c017b75
Examples: Simplified mouse wheel handling. ( #1463 )
7 years ago
7dea158175
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. ( #1463 )
7 years ago
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
7 years ago
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
f3e510a9bf
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. ( #1559 )
...
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
7 years ago
00351ee2ab
Examples: SDL: Minor renaming.
7 years ago
ba99900023
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
7 years ago
79dca9d5e6
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
7 years ago
15fd5b6c4c
Examples: SDL: Minor renaming.
7 years ago
ce17e0f274
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. ( #1559 )
7 years ago
60d5dc7902
Examples: SDL: Fixed mapping of Insert key ( #1555 , fix bug introduced in #1541 )
7 years ago
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
7 years ago
39cb56c39e
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 ( #1466 )
7 years ago
7484c63449
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 ( #1466 , #1504 )
7 years ago
3d24a9eb40
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. ( #1538 )
7 years ago
65dd55cb2b
Merge pull request #1538 from ndandoulakis/ndandoulakis-CS_DBLCLKS-patch
...
Examples: DirectX9,10,10: Support for CS_DBLCLKS by treating double-click down messages are regular down. (#1538 , #754 )
7 years ago
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
7 years ago
bfc25bc8a3
CS_DBLCLKS support for DirectX 11
7 years ago
583e97b297
CS_DBLCLKS support for DirectX 10
7 years ago
20ae6439ea
CS_DBLCLKS support for Directx9
7 years ago
4c90529c62
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
7 years ago
9f8632b131
Examples: Comments about invalid mouse pos.
7 years ago
78f48bb795
Examples: DirectX10,DirectX11: Moved call to OMSetRenderTargets() in main loop so example code can integrate more nicely with other code.
7 years ago
3a4a2bb27c
Examples: Vulkan: Tweak
7 years ago
ce13426a1a
Examples: Comments, synched some minor drift between examples + stronger suggestion to use StyleColorsDark().
7 years ago
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
b263bc5689
Examples: DirectX: Using IM_ARRAYSIZE()
7 years ago
cf9b893841
Examples: Added null_example/ which is helpful for quick testing on multiple compilers/settings without relyong on graphics library.
7 years ago
c8b5b569da
Examples: DirectX9: Call EndFrame(), fix for assert added in 9a44d447cd
7 years ago
e000ee0116
Examples: DirectX9: Handle loss of D3D9 device (D3DERR_DEVICELOST). ( #1464 )
7 years ago
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
7 years ago
ef5dd30625
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
7 years ago
6bd3b45b34
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
7 years ago
979fe30a6f
Fix wrong comment in dx implementation headers
7 years ago
fba704bf5d
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard ( #1262 , #1237 , #1219 , #635 , #1058 , #1051 , #912 , #533 , #703 , #446 , #459 , #364 , #213 , #52 , and more)
7 years ago
36f00811b9
Examples: Comments to guide people unfamiliar with the librairies used.
7 years ago
omar
Gilad Reich
DomRe
Alzathar
Sebastian Krzyszkowiak
Michał Janiszewski
Cort
Hui
Brandon
Warren Moore
hesiod
Michael Vetter
MindSpunk
Jiří Šebele
Jérémie Dumas
Ryan Crandall
luk1337
Matthias Moulin
Dado
Marcel Smit
Omar Sherif Fathy
Warren Moore
Konstantin Podsvirov
codecnotsupported
Aiekick
ice1000
Elias Daler
SR_team
daniel-murray
Christian Forfang
Peter Particle
Sam Hocevar
omar
Oliver Faircliff
Gerry Hernandez
Jérôme Pasquier
Nick Dandoulakis
Emmanuel Benoît
Codecat