omar
|
8ef0ca9765
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-08-01 12:27:56 +02:00 |
|
omar
|
d69b2a1c1d
|
Changelog for #1989
|
2018-08-01 12:23:59 +02:00 |
|
omar
|
cc64bd9e3c
|
Comments
|
2018-08-01 11:54:54 +02:00 |
|
omar
|
87e2fea09d
|
Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. (#1427, #1495, #822, #473, #650)
Demo: Exposed flags in Demo.
|
2018-08-01 11:50:57 +02:00 |
|
omar
|
65b46f62ef
|
Fixed PushID() from keeping alive the new ID Stack top value (if a previously active widget shared the ID it would be erroneously kept alive) (drag and drop demo could soft-lock the UI until pressing Escape!)
|
2018-07-31 17:28:18 +02:00 |
|
omar
|
faf2c34149
|
Drag and Drop: Added ImGuiDragDropFlags_SourceAutoExpirePayload flag to force payload to expire if the source stops being submitted. (#1725, #143).
|
2018-07-31 13:46:19 +02:00 |
|
omar
|
9824bf1ba1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-07-31 12:12:56 +02:00 |
|
omar
|
e13e5982ff
|
Drag and Drop: Payload stays available and under the mouse if the source stops being submitted, however the tooltip is replaced by "..." + moved FrameScopeActive = false at the bottom of EndFrame() for safety. (#1725)
|
2018-07-31 12:11:18 +02:00 |
|
omar
|
a7ac9e8346
|
Made assertion more clear when trying to call Begin() outside of the NewFrame()..EndFrame() scope. (#1987)
|
2018-07-30 18:20:25 +02:00 |
|
omar
|
544db70852
|
Examples: OpenGL3: Tweaks, added changelog. (#1941)
|
2018-07-30 14:00:53 +02:00 |
|
omar
|
f9e8b5c652
|
CollapseButton: Added hovering highlight + minor consistency tweaks.
|
2018-07-27 13:32:33 +02:00 |
|
omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-07-24 16:50:49 +02:00 |
|
omar
|
528b50a89f
|
Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. (#1463, #1380, #1502)
|
2018-07-22 19:04:15 +02:00 |
|
omar
|
e07f5d4c78
|
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
|
2018-07-22 18:46:41 +02:00 |
|
omar
|
23b67e6ff5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-17 19:52:14 +02:00 |
|
omar
|
93321d3280
|
Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. (#787)
|
2018-07-17 19:48:53 +02:00 |
|
omar
|
0c207b7bc9
|
Demo: Clarified the use of IsItemHovered()/IsItemActive() right after being in the "Active, Focused, Hovered & Focused Tests" section. This will be of more importance with the introduction of tabs.
|
2018-07-17 11:49:41 +02:00 |
|
omar
|
ee98a069f0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# imgui_demo.cpp
|
2018-07-16 22:25:36 +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
|
abe7b190dc
|
Examples: DX10, DX11: Fixed unreleased resources in Init and Shutdown functions. (#1944)
|
2018-07-13 11:25:54 +02:00 |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2018-07-12 10:03:18 +02:00 |
|
omar
|
9007dff5eb
|
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211)
+ shallow changelog tweaks
|
2018-07-10 19:16:57 +02:00 |
|
omar
|
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.)
|
2018-07-10 18:29:57 +02:00 |
|
omar
|
de13261f1b
|
OpenGL3: Added error output when shaders fail to compile / link. (#1938)
|
2018-07-10 16:09:34 +02:00 |
|
omar
|
dd61c4802a
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:22:49 +02:00 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:16:48 +02:00 |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
17efd7b3b0
|
Demo: Added basic Drag and Drop demo. (#143, #1931)
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
bd6097ac6f
|
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks.
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
a33f0d1f7f
|
Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143)
|
2018-07-08 16:38:57 +02:00 |
|
omar
|
b0cdfe0ece
|
Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. (#1909)
|
2018-07-08 13:27:16 +02:00 |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-08 13:08:16 +02:00 |
|
omar
|
c790723cfa
|
Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). (#1875, #143)
|
2018-07-08 13:03:39 +02:00 |
|
Omar Cornut
|
839e4d34bd
|
Merge branch 'warrenm_osx'
|
2018-07-08 10:47:55 +02:00 |
|
Omar Cornut
|
c3f9220c15
|
Apple: Fixed example_osx_opengl2, renamed to example_apple_opengl2 + misc comments
|
2018-07-08 10:47:31 +02:00 |
|
omar
|
42bf149ac6
|
Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor io.OptResizeWindowsFromEdges=true to enable the feature globally. (#1495) The feature is not currently enabled by default because it is not satisfying enough.
|
2018-07-06 15:30:21 +02:00 |
|
omar
|
0d7e779b37
|
Merge branch 'master' into osx
# Conflicts:
# examples/.gitignore
# examples/README.txt
|
2018-07-04 13:13:11 +02:00 |
|
omar
|
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
|
2018-07-02 20:13:16 +02:00 |
|
omar
|
645ab6633c
|
Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276)
|
2018-07-01 12:25:37 +02:00 |
|
omar
|
6e67afc500
|
Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. (followup to #1914)
|
2018-06-29 16:36:40 +02:00 |
|
omar
|
62b3d7c51e
|
Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913, #1914)
|
2018-06-29 16:36:40 +02:00 |
|
omar
|
b16603745c
|
Allow menu windows from ignoring the style.WindowMinSize values so short menus are not padded. (#1909)
|
2018-06-28 11:33:03 +02:00 |
|
omar
|
c38fe6b0e1
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-06-26 12:41:36 +02:00 |
|
omar
|
14ceaaf460
|
ArrowButton: Fixed to honor PushButtonRepeat() setting (and internals' ImGuiItemFlags_ButtonRepeat). Setup current line text baseline so that ArrowButton() + SameLine() + Text() are aligned properly.
|
2018-06-26 12:37:20 +02:00 |
|
omar
|
ce500f8727
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_win32.cpp
|
2018-06-22 12:01:42 +02:00 |
|
omar
|
d68633398b
|
Examples: Vulkan: nverted the parameters to ImGui_ImplVulkan_RenderDrawData() to be consistent with other bindings.
|
2018-06-22 10:02:02 +02:00 |
|
omar
|
1b74e3be02
|
Version 1.62
|
2018-06-22 09:41:25 +02:00 |
|
omar
|
f9a5ff7a19
|
Examples: DirectX12: Moved the ID3D12GraphicsCommandList* parameter from ImGui_ImplDX12_NewFrame() to ImGui_ImplDX12_RenderDrawData() which makes a lots more sense. (#301)
|
2018-06-21 12:13:04 +02:00 |
|
omar
|
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
|
2018-06-21 12:04:00 +02:00 |
|
omar
|
c44a4bed84
|
Examples: Fixed bindings to use ImGuiMouseCursor_COUNT instead of old name ImGuiMouseCursor_Count_ so they can compile with IMGUI_DISABLE_OBSOLETE_FUNCTIONS. (#1887)
|
2018-06-20 11:06:29 +02:00 |
|