ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-11 11:36:38 +02:00 |
|
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
2020-06-09 16:56:48 +02:00 |
|
ocornut
|
fbaf65b8f6
|
Revert "Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)"
This reverts commit f2c7f3b200.
|
2020-03-06 17:53:09 +01:00 |
|
ocornut
|
f2c7f3b200
|
Viewports: Renamed UpdatePlatformWindows > PlatformWindowsUpdate, RenderPlatformWindowsDefault -> PlatformWindowsRender, DestroyPlatformWindows > PlatformWindowsDestroy (#1542)
|
2020-03-06 17:28:32 +01:00 |
|
Omar
|
bb1e6f8af6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2020-02-17 18:33:59 +01:00 |
|
Omar
|
b62f1ea8e9
|
Fix zealous PVS studio warnings. Minor tweaks.
|
2020-02-17 16:17:46 +01:00 |
|
Omar
|
8601187fee
|
Backends: Win32: Clarify how the WndProc handler requires a forward declaration.
|
2020-02-17 10:22:39 +01:00 |
|
omar
|
813e0c18e6
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-11-26 12:23:43 +01:00 |
|
omar
|
26d177bc03
|
Docs: Moved misc/fonts/README.txt to docs/FONTS.txt. + tweaks
|
2019-11-25 18:29:28 +01:00 |
|
omar
|
431aa4e456
|
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
2019-06-06 16:13:30 +02:00 |
|
omar
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
omar
|
35cbf9c052
|
Examples: Visual Studio: Updated default platform toolset+sdk in vcproj files from v100+sdk7 (vs2010) to v110+sdk8 (vs2012). This is mostly so we can remove reliance on DXSDK_DIR for the DX10/DX11 example, which if existing and when switching to recent SDK ends up conflicting and creating warnings.
|
2019-04-15 15:48:38 +02:00 |
|
omar
|
a26085ed53
|
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211) + Examples comments
|
2019-03-12 22:23:56 +01:00 |
|
omar
|
f7db4fad31
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
2019-03-11 16:08:16 +01:00 |
|
omar
|
6767b0a1b0
|
Examples: Win32+DirectX: moved helper functions below main.
|
2019-03-11 16:00:18 +01:00 |
|
omar
|
3eedb542a6
|
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
|
2019-03-11 11:07:23 +01:00 |
|
Gilad Reich
|
0a6c5bc234
|
Examples: DirectX9: Added support for multi-viewport (#2394)
|
2019-03-06 21:36:42 +01:00 |
|
omar
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-03-06 21:18:46 +01:00 |
|
omar
|
510342f024
|
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
|
2019-03-06 18:00:04 +01:00 |
|
omar
|
87ded34f9f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
|
2019-02-22 12:29:18 +01:00 |
|
omar
|
d0c98bf880
|
Examples: VS: Made project paths independant of SolutionDir so they can be built aside from the solution.
|
2019-02-19 20:13:06 +01:00 |
|
omar
|
f94af2f5c5
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
|
2019-01-20 22:13:35 +01:00 |
|
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
|
2019-01-20 22:12:06 +01:00 |
|
omar
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
2019-01-20 17:56:17 +01:00 |
|
omar
|
82e31d34f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
|
2019-01-18 12:31:33 +01:00 |
|
omar
|
295ada0364
|
Examples: Win32: Using wc.lpszClassName instead of duplicating the literal. + tweak README format.
|
2019-01-17 18:30:15 +01:00 |
|
omar
|
238321c159
|
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
|
2018-12-21 16:56:26 +01:00 |
|
omar
|
81a2546cea
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
|
2018-12-20 23:06:29 +01:00 |
|
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
|
2018-12-20 23:04:40 +01:00 |
|
omar
|
d5b22fb635
|
Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
|
2018-12-20 22:58:34 +01:00 |
|
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
2018-11-15 14:00:01 +01:00 |
|
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
2018-11-08 16:56:51 +01:00 |
|
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
2018-11-08 16:06:22 +01:00 |
|
omar
|
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
|
2018-09-21 11:52:32 +02:00 |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
2018-09-20 10:31:23 +02:00 |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-14 11:38:10 +02:00 |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
2018-09-13 16:50:13 +02:00 |
|
omar
|
49533bc86e
|
Examples: Enabled Docking + Nav by default in the branch. (#351)
|
2018-09-06 21:53:35 +02:00 |
|
omar
|
01586d33f3
|
Refactor: Added empty imgui_widgets.cpp + updated project files / makefiles etc. accordingly (#2036)
|
2018-08-30 14:29:11 +02:00 |
|
omar
|
ff83d0e369
|
Examples: Using fully qualified "Dear ImGui" name in window titles.
|
2018-07-23 17:31:13 +02:00 |
|
omar
|
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.
|
2018-07-16 22:17:34 +02:00 |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
2018-06-10 15:42:14 +02:00 |
|