omar
|
d4dd448511
|
Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
|
7 years ago |
|
omar
|
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 |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
7 years ago |
|
omar
|
dd079fe6e6
|
Version 1.60 (missed the string). Will retag.
|
7 years ago |
|
omar
|
8acda84202
|
Nav: Fixed comment. (#1599)
|
7 years ago |
|
omar
|
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 |
|
omar
|
c2fc978983
|
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) (#707)
|
7 years ago |
|
omar
|
c1bdab6d5b
|
Comments about io.WantCapture flags + todo entries.
|
7 years ago |
|
omar
|
2464e62a1a
|
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
|
7 years ago |
|
omar
|
72b7f48870
|
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments
|
7 years ago |
|
omar
|
84c6ea0cee
|
Viewport: Comments about honoring ImGuiViewportFlags_NoInputs and MouseHoveredViewport. (#1542)
|
7 years ago |
|
omar
|
9d8bc79025
|
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. (#1542)
|
7 years ago |
|
omar
|
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 |
|
omar
|
4649967112
|
Added extra comments and assertions to avoid user combining ImGuiCond flags. (#1694)
|
7 years ago |
|
omar
|
cd1e6e384f
|
Tooltip windows uses PopupBorderSize (#1697) + commented out debug stuff.
|
7 years ago |
|
omar
|
ac8931b2e9
|
Viewport: Moved OverlayDrawList to be a per-viewport instead of being global + fix overlay clipping glitch during viewport creation frame + support for software mouse cursor stradding over multiple viewport. The overlay draw list move is rather important as draw lists are not shared among viewports anymore and we can do a swap of their data without copying it. (#1542)
|
7 years ago |
|
omar
|
c19b27813d
|
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. (#1011) May transition the other InputXXX function to use format strings as well.
|
7 years ago |
|
omar
|
c796960ff9
|
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011)
|
7 years ago |
|
omar
|
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 |
|
omar
|
75c3793db5
|
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)
|
7 years ago |
|
omar
|
dcf7c3d188
|
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787, #1542)
|
7 years ago |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
70d500502a
|
ImVector: Fixed insert() helper using the = operator (followup to be consistent with 4186c2c2b1)
|
7 years ago |
|
omar
|
2fecd332fc
|
Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)
|
7 years ago |
|
omar
|
33ad8b2f0c
|
Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks
|
7 years ago |
|
omar
|
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 |
|
omar
|
bcf4ed28a9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
d8d93f6360
|
imgui.h: Various comments and tweaks.
|
7 years ago |
|
omar
|
6fe22e6297
|
imgui.h: Moved columns lower in the file. Various spacing changes and minor comments.
|
7 years ago |
|
omar
|
6cfc9e6256
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
7 years ago |
|
omar
|
6bda816ffe
|
ImVector: Added copy/assign operators as helpers to ease cloning of data.
|
7 years ago |
|
omar
|
1e296453ef
|
ImDrawList: Added Clone() helper function.
|
7 years ago |
|
omar
|
4186c2c2b1
|
ImVector: resize() / push_back() use memcpy() as we are not supposed to be constructor/destructor/operator aware at all. (If we do need to rework ImVector). In turn this will allow us to define assign/copy operators.
|
7 years ago |
|
omar
|
d68be086b2
|
ImVector: Using value_type consistently. Spacing.
|
7 years ago |
|
omar
|
533c86a7a3
|
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
|
7 years ago |
|
omar
|
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 |
|
omar
|
921bb92eec
|
Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. (#1542)
|
7 years ago |
|
omar
|
c50198debe
|
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize (#1542) wip
|
7 years ago |
|
omar
|
8657201257
|
Merge branch 'master' into viewport
|
7 years ago |
|
omar
|
0e3a6ef4f7
|
Moved IM_NEW, IM_DELETE helpers to imgui.h for convenient use by back-ends and user code.
|
7 years ago |
|
omar
|
7b833dabc8
|
ImVector: Spacing, assert tweaks
|
7 years ago |
|
omar
|
26296bb4c1
|
Misc: Fix 111ea7af77, GetStyleColorName() would assert, removed removed ImGuiCol defines (too much risk/complexity trying to silently ignore it).
|
7 years ago |
|
omar
|
b88492746e
|
Examples, Viewport: Vulkan: Experiment (broken) multi-viewport support, merging code from ParticlePeter branches. (#1542, #1042)
|
7 years ago |
|
omar
|
f6fc28dfd2
|
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042)
|
7 years ago |
|
omar
|
111ea7af77
|
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
|
7 years ago |
|
omar
|
e7670c0bcc
|
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. (#707)
|
7 years ago |
|
omar
|
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 |
|
omar
|
1f6ad7a894
|
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
|
7 years ago |
|
omar
|
64cbbed152
|
Merge branch 'master' into viewport
|
7 years ago |