omar
|
e45d7a7060
|
Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (#1565, #586, #992, #1007, #1558)
|
2018-01-21 20:16:54 +01:00 |
|
omar
|
5a301c29dc
|
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565, #586, #992, #1007, #1558)
|
2018-01-21 20:16:54 +01:00 |
|
omar
|
ac5b7a1bdf
|
Comments
|
2018-01-21 20:10:23 +01:00 |
|
omar
|
8b64d50cc4
|
Merge pull request #1564 from PanosK92/master
Simplified return of ImGui::IsKeyReleased().
|
2018-01-21 17:20:44 +01:00 |
|
Panos Karabelas
|
7c8a19978d
|
Simplified return of ImGui::IsKeyReleased()
|
2018-01-21 16:02:09 +00:00 |
|
omar
|
5eb293c879
|
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
|
2018-01-20 20:32:23 +01:00 |
|
omar
|
cd1409f4bf
|
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! (#939)
|
2018-01-20 20:25:12 +01:00 |
|
omar
|
7e7c017b75
|
Examples: Simplified mouse wheel handling. (#1463)
|
2018-01-20 12:45:31 +01:00 |
|
omar
|
7dea158175
|
Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463)
|
2018-01-20 12:36:59 +01:00 |
|
omar
|
0b1fecb792
|
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463)
|
2018-01-20 12:36:16 +01:00 |
|
omar
|
6f6b6194b2
|
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
|
2018-01-20 12:06:06 +01:00 |
|
omar
|
d4bf9b4686
|
Renaming for consistency.
|
2018-01-19 15:47:10 +01:00 |
|
omar
|
8877622fa8
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-19 15:42:28 +01:00 |
|
omar
|
e5a6e85f6d
|
Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345)
|
2018-01-19 15:37:25 +01:00 |
|
omar
|
42a612d7c9
|
Begin: Removed asserts that got in the way of some flags combination. (#1345)
|
2018-01-19 15:33:35 +01:00 |
|
omar
|
0978f00911
|
MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now.
|
2018-01-19 15:14:53 +01:00 |
|
omar
|
f3e510a9bf
|
Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. (#1559)
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
|
2018-01-19 10:46:54 +01:00 |
|
omar
|
00351ee2ab
|
Examples: SDL: Minor renaming.
|
2018-01-19 09:55:49 +01:00 |
|
omar
|
ba99900023
|
Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
|
2018-01-19 09:50:58 +01:00 |
|
omar
|
79dca9d5e6
|
Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
|
2018-01-19 09:50:58 +01:00 |
|
omar
|
15fd5b6c4c
|
Examples: SDL: Minor renaming.
|
2018-01-19 09:43:28 +01:00 |
|
omar
|
ce17e0f274
|
Examples: SDL: Using SDL_WINDOW_INPUT_FOCUS instead of SDL_WINDOW_MOUSE_FOCUS (which is ~~hovered). We should use SDL_CaptureMouse + SDL_WINDOW_MOUSE_CAPTURE_FLAG which requires SDL 2.0.4 will give it a try shortly. (#1559)
|
2018-01-19 09:25:31 +01:00 |
|
omar
|
74dc70c543
|
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559)
|
2018-01-19 09:16:26 +01:00 |
|
omar
|
c2ffce3e5a
|
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143)
|
2018-01-18 17:39:40 +01:00 |
|
omar
|
63d47e8328
|
Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143)
|
2018-01-18 17:32:34 +01:00 |
|
omar
|
932d3f0198
|
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments.
|
2018-01-18 10:06:58 +01:00 |
|
omar
|
60d5dc7902
|
Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541)
|
2018-01-18 10:01:36 +01:00 |
|
omar
|
d1f726cd9d
|
Comments about Begin/End pair and handling of return value.
|
2018-01-17 12:46:07 +01:00 |
|
omar
|
cc15512bfc
|
InputText: Minor tweak.
|
2018-01-17 12:15:24 +01:00 |
|
omar
|
7ccbb765e2
|
InputText: Cursor X position not lost when clicking outside on an item that's submitted after the InputText(). It was only noticeable when restoring focus programmatically. (#1418, #1554)
|
2018-01-17 12:15:00 +01:00 |
|
omar
|
2f15cc0855
|
Nav: Fixed popup wrap-around logic for windows with scrolling. (#787)
|
2018-01-15 21:55:32 +01:00 |
|
omar
|
05885b2e6d
|
Merge fix.
|
2018-01-15 20:18:01 +01:00 |
|
omar
|
a221d253f3
|
Nav: Comment.
|
2018-01-15 20:13:49 +01:00 |
|
omar
|
472ba1394c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-15 20:13:42 +01:00 |
|
omar
|
28a76af185
|
Internal: DrawData: Tidying, renaming.
|
2018-01-15 20:12:48 +01:00 |
|
omar
|
a77913054f
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-01-15 18:02:58 +01:00 |
|
omar
|
1182174d81
|
Internals: DrawData: We don't need an intermediate layer for popups.
|
2018-01-15 18:00:13 +01:00 |
|
omar
|
0c06b43e6b
|
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
|
2018-01-15 17:55:38 +01:00 |
|
omar
|
038453258e
|
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
061d8df033
|
MIssing IMGUI_API for a type with non-inline methods.
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
06eef2ce6f
|
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
|
2018-01-15 17:48:32 +01:00 |
|
omar
|
6eff21ee5e
|
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)"
This reverts commit 03f5cd6ca1.
|
2018-01-15 16:19:01 +01:00 |
|
omar
|
514d30d8cd
|
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345.
|
2018-01-14 14:13:54 +01:00 |
|
omar
|
8b432cf590
|
Merge pull request #1551 from Crunkle/master
Fix incorrect header name on Linux MinGW systems.
|
2018-01-14 11:26:03 +01:00 |
|
Crunkle
|
daa38f2ad0
|
Fix cross compilers
|
2018-01-14 03:31:22 +00:00 |
|
omar
|
db63e71f13
|
Internals: Exposed SetCurrentFont() in imgui_internal.h
|
2018-01-12 20:07:01 +01:00 |
|
omar
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
2018-01-12 19:53:27 +01:00 |
|
omar
|
c85d7d6e49
|
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787)
|
2018-01-12 19:28:37 +01:00 |
|
omar
|
c9be7d7254
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-01-12 19:21:12 +01:00 |
|
omar
|
0a98202714
|
Nav: Standardized FIXME-NAV marker.
|
2018-01-12 19:13:15 +01:00 |
|