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
|
6 years ago |
|
omar
|
6767b0a1b0
|
Examples: Win32+DirectX: moved helper functions below main.
|
6 years ago |
|
omar
|
3eedb542a6
|
Viewports: Renamed ConfigViewportsNoParent to ConfigViewportsNoDefaultParent. Fix outdated comments in examples.
|
6 years ago |
|
omar
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
|
omar
|
510342f024
|
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
|
6 years ago |
|
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
|
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
|
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
|
238321c159
|
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
|
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
|
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
|
b8d9c5c130
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
12a1e7d04e
|
Viewport: Comment to suggest making WindowBg opaque when viewports are enabled.
|
6 years ago |
|
omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
6 years ago |
|
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
6 years ago |
|
omar
|
9d155c73bc
|
Examples: Misc comments mainly related to GLFW callbacks. (#1759)
|
6 years ago |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
6 years ago |
|
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
6 years ago |
|
omar
|
b57baa5ba0
|
Viewport: Enabled viewports by default in more example apps.
|
6 years ago |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
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 |
|
omar
|
1afd29d382
|
Examples: Using "dear imgui" terminology in all examples headers/comments + fix minor typo.
|
6 years ago |
|
omar
|
b872aa5c8e
|
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
|
6 years ago |
|
omar
|
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 |
|
omar
|
49533bc86e
|
Examples: Enabled Docking + Nav by default in the branch. (#351)
|
6 years ago |
|
omar
|
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 |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
ff83d0e369
|
Examples: Using fully qualified "Dear ImGui" name in window titles.
|
6 years ago |
|
omar
|
ee98a069f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
|
6 years ago |
|
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.
|
6 years ago |
|
omar
|
9660657e95
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
|
omar
|
8d58fbb5ed
|
Examples: Renamed example folders. (#1870)
|
6 years ago |