omar
|
e25da4230b
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-04-11 21:25:44 +02:00 |
|
omar
|
83bd3595a4
|
Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. (#1542)
|
2018-04-10 22:58:39 +02:00 |
|
omar
|
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)
|
2018-04-10 22:32:08 +02:00 |
|
omar
|
7ddc22b326
|
Viewports, DPI: Renamed config flags. (#1542)
|
2018-04-10 20:02:43 +02:00 |
|
omar
|
0d5042f0f3
|
Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. (#1542)
|
2018-04-10 19:15:44 +02:00 |
|
omar
|
74a11e2087
|
Viewport: Merge fix conflicting flags.
|
2018-04-09 22:15:46 +02:00 |
|
omar
|
d4dd448511
|
Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
|
2018-04-09 22:01:58 +02:00 |
|
omar
|
9117632bf0
|
Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
|
2018-04-09 20:42:49 +02:00 |
|
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
|
2018-04-09 19:35:14 +02:00 |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
2018-04-09 14:02:32 +02:00 |
|
omar
|
dd079fe6e6
|
Version 1.60 (missed the string). Will retag.
|
2018-04-09 13:52:24 +02:00 |
|
omar
|
8acda84202
|
Nav: Fixed comment. (#1599)
|
2018-04-08 12:27:11 +02:00 |
|
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
|
2018-04-06 23:36:23 +02:00 |
|
omar
|
c2fc978983
|
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) (#707)
|
2018-04-06 23:25:25 +02:00 |
|
omar
|
c1bdab6d5b
|
Comments about io.WantCapture flags + todo entries.
|
2018-04-06 19:36:14 +02:00 |
|
omar
|
2464e62a1a
|
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
|
2018-04-06 19:36:13 +02:00 |
|
omar
|
72b7f48870
|
Renamed ImGuiConfigFlags_NoSetMouseCursor to ImGuiConfigFlags_NoMouseCursorChange. Followup to 75c3793db5 two weeks ago. (#787, #1495, #1202) + comments
|
2018-04-06 18:12:21 +02:00 |
|
omar
|
84c6ea0cee
|
Viewport: Comments about honoring ImGuiViewportFlags_NoInputs and MouseHoveredViewport. (#1542)
|
2018-04-05 12:27:17 +02:00 |
|
omar
|
9d8bc79025
|
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. (#1542)
|
2018-04-05 11:06:00 +02:00 |
|
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
|
2018-04-04 19:39:42 +02:00 |
|
omar
|
4649967112
|
Added extra comments and assertions to avoid user combining ImGuiCond flags. (#1694)
|
2018-04-04 15:01:01 +02:00 |
|
omar
|
cd1e6e384f
|
Tooltip windows uses PopupBorderSize (#1697) + commented out debug stuff.
|
2018-04-04 12:39:48 +02:00 |
|
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)
|
2018-03-22 22:09:42 +01:00 |
|
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.
|
2018-03-22 18:58:40 +01:00 |
|
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)
|
2018-03-22 17:49:53 +01:00 |
|
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
|
2018-03-20 22:14:34 +01:00 |
|
omar
|
75c3793db5
|
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. (#787, #1495, #1202)
|
2018-03-20 21:19:23 +01:00 |
|
omar
|
dcf7c3d188
|
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. (#787, #1542)
|
2018-03-20 20:39:44 +01:00 |
|
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)
|
2018-03-20 20:12:34 +01:00 |
|
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
|
2018-03-20 16:05:31 +01:00 |
|
omar
|
70d500502a
|
ImVector: Fixed insert() helper using the = operator (followup to be consistent with 4186c2c2b1)
|
2018-03-20 11:35:10 +01:00 |
|
omar
|
2fecd332fc
|
Viewport, Platform: Added void* to render/swap buffer functions. Comments. (#1542, #1042)
|
2018-03-19 15:20:47 +01:00 |
|
omar
|
33ad8b2f0c
|
Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks
|
2018-03-19 13:20:18 +01:00 |
|
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)
|
2018-03-18 18:44:57 +01:00 |
|
omar
|
bcf4ed28a9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
2018-03-18 12:51:57 +01:00 |
|
omar
|
d8d93f6360
|
imgui.h: Various comments and tweaks.
|
2018-03-18 12:24:28 +01:00 |
|
omar
|
6fe22e6297
|
imgui.h: Moved columns lower in the file. Various spacing changes and minor comments.
|
2018-03-18 12:23:33 +01:00 |
|
omar
|
6cfc9e6256
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
2018-03-17 21:20:01 +01:00 |
|
omar
|
6bda816ffe
|
ImVector: Added copy/assign operators as helpers to ease cloning of data.
|
2018-03-17 21:18:14 +01:00 |
|
omar
|
1e296453ef
|
ImDrawList: Added Clone() helper function.
|
2018-03-17 21:18:14 +01:00 |
|
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.
|
2018-03-17 20:42:56 +01:00 |
|
omar
|
d68be086b2
|
ImVector: Using value_type consistently. Spacing.
|
2018-03-17 18:08:12 +01:00 |
|
omar
|
533c86a7a3
|
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
|
2018-03-17 17:29:58 +01:00 |
|
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)
|
2018-03-13 23:16:15 +01:00 |
|
omar
|
921bb92eec
|
Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. (#1542)
|
2018-03-13 16:20:34 +01:00 |
|
omar
|
c50198debe
|
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize (#1542) wip
|
2018-03-13 16:20:27 +01:00 |
|
omar
|
8657201257
|
Merge branch 'master' into viewport
|
2018-03-13 16:20:02 +01:00 |
|
omar
|
0e3a6ef4f7
|
Moved IM_NEW, IM_DELETE helpers to imgui.h for convenient use by back-ends and user code.
|
2018-03-13 16:18:40 +01:00 |
|
omar
|
7b833dabc8
|
ImVector: Spacing, assert tweaks
|
2018-03-13 16:18:40 +01:00 |
|
omar
|
26296bb4c1
|
Misc: Fix 111ea7af77, GetStyleColorName() would assert, removed removed ImGuiCol defines (too much risk/complexity trying to silently ignore it).
|
2018-03-13 11:53:12 +01:00 |
|