 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
|
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
|
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
|
28a76af185
|
Internal: DrawData: Tidying, renaming.
|
2018-01-15 20:12:48 +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
|
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
|
1493de4f81
|
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
|
2018-01-12 19:53:27 +01:00 |
|
|
omar
|
16285603f2
|
Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless)
|
2018-01-12 19:11:11 +01:00 |
|
|
omar
|
cc173d7619
|
Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
2018-01-11 23:21:24 +01:00 |
|
|
omar
|
5e9ae92ae9
|
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542)
|
2018-01-11 23:17:34 +01:00 |
|
|
omar
|
6a1011cf53
|
MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
2018-01-11 18:16:16 +01:00 |
|
|
omar
|
b74f24c3e5
|
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)"
This reverts commit 651538e13b.
|
2018-01-11 18:08:14 +01:00 |
|
|
omar
|
7d2a068dea
|
Begin: Shuffling bits of code around.
|
2018-01-11 17:33:37 +01:00 |
|
|
omar
|
651538e13b
|
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)
|
2018-01-11 16:43:03 +01:00 |
|
|
omar
|
a8bbb0b7dd
|
Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts.
|
2018-01-11 15:47:07 +01:00 |
|
|
omar
|
12aa3cb09e
|
Demo: Tweaks format.
|
2018-01-11 15:22:33 +01:00 |
|
|
omar
|
398a4e1865
|
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382)
|
2018-01-11 13:58:25 +01:00 |
|
|
omar
|
a63fbbca8b
|
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382)
|
2018-01-11 13:51:18 +01:00 |
|
|
omar
|
1eee10778b
|
Internals: Begin: Refactor some code into an UpdateManualResize() function.
|
2018-01-10 23:06:51 +01:00 |
|
|
omar
|
483f9b0d07
|
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
|
2018-01-10 22:55:29 +01:00 |
|
|
omar
|
6c583315e6
|
Begin: Moving some code around for the benefits of the wip viewport branch.
|
2018-01-10 18:56:51 +01:00 |
|
|
omar
|
f610e25682
|
Internals: Using ImFloor().when appropriate.
|
2018-01-10 18:33:29 +01:00 |
|
|
omar
|
0cabd81071
|
Internals: Rect: Added ClipWillFull helper + comments on variations.
|
2018-01-10 14:43:08 +01:00 |
|
|
omar
|
92d75c44bc
|
Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience.
|
2018-01-10 14:43:02 +01:00 |
|
|
omar
|
933ee6cd5d
|
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541)
|
2018-01-08 16:01:30 +01:00 |
|
|
omar
|
fd4d63a0c5
|
InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541)
|
2018-01-08 15:56:01 +01:00 |
|
|
omar
|
ce95b84825
|
Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541)
|
2018-01-08 15:30:39 +01:00 |
|
|
omar
|
39cb56c39e
|
Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466)
|
2018-01-07 19:09:34 +01:00 |
|
|
omar
|
7484c63449
|
Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504)
|
2018-01-07 19:09:33 +01:00 |
|
|
omar
|
168200f915
|
Popups: Comments, reorganize bits of the header section, renamed parameters.
|
2018-01-07 18:17:47 +01:00 |
|
|
omar
|
a8e5542d78
|
BeginPopup: Exposed extra_flags publicly. (#1533)
|
2018-01-07 18:13:01 +01:00 |
|
|
omar
|
3fc7cf190d
|
OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). (#1497, #1533)
|
2018-01-07 16:20:02 +01:00 |
|
|
omar
|
deab2ab015
|
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497)
|
2018-01-07 16:15:54 +01:00 |
|
|
omar
|
69ff65f054
|
Internals: Popup: Renaming fields.
|
2018-01-07 16:11:25 +01:00 |
|
|
omar
|
3678307cd9
|
Popup, Menus: Tweaks and comments.
|
2018-01-07 15:56:14 +01:00 |
|
|
omar
|
369189b675
|
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
|
2018-01-07 15:40:46 +01:00 |
|
|
omar
|
e09852fc49
|
Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
|
2018-01-07 15:34:15 +01:00 |
|
|
omar
|
63e4677b81
|
Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
|
2018-01-07 15:23:57 +01:00 |
|
|
omar
|
c337cdcfd3
|
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
|
2018-01-07 15:02:09 +01:00 |
|
|
omar
|
d730a763f6
|
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
|
2018-01-07 14:32:42 +01:00 |
|
|
omar
|
a34490239c
|
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
|
2018-01-07 14:03:56 +01:00 |
|
|
omar
|
5fd19f037f
|
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
|
2018-01-07 12:48:11 +01:00 |
|
|
omar
|
2874aabb93
|
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
|
2018-01-07 12:48:11 +01:00 |
|
|
omar
|
3d24a9eb40
|
Examples: DirectX9/10/11: Comments about CS_DBLCLKS + formatting tweaks. (#1538)
|
2018-01-05 22:32:27 +01:00 |
|
|
omar
|
407955d9fb
|
Examples: Using IM_OFFSETOF macro. + Comments
|
2018-01-05 22:05:02 +01:00 |
|
|
omar
|
95b773370f
|
Revert "Internals: Added LastActiveId, LastActiveIdTimer. (#1537)" Will come up with a better design later.
This reverts commit 007f4034c9.
|
2018-01-05 17:40:51 +01:00 |
|
|
omar
|
007f4034c9
|
Internals: Added LastActiveId, LastActiveIdTimer. (#1537)
|
2018-01-05 15:33:24 +01:00 |
|
|
omar
|
4c90529c62
|
Examples: Visual Studio projects: Disabled extraneous function-level check in Release build.
|
2018-01-04 11:42:05 +01:00 |
|
|
omar
|
ecbfdd3143
|
Added extraneous initialization to NULL. (#1527).
|
2018-01-04 11:06:12 +01:00 |
|
|
omar
|
4fc9f44073
|
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
|
2018-01-03 20:46:54 +01:00 |
|
|
omar
|
4b1240b2e1
|
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
|
2018-01-03 20:45:24 +01:00 |
|
|
omar
|
b2ec0741f1
|
Internals: Settings api tweaks
|
2018-01-03 20:45:17 +01:00 |
|
|
omar
|
0a0b252bb6
|
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
|
2018-01-03 17:02:51 +01:00 |
|
|
omar
|
a7deb3a394
|
Demo: Minor tweaks.
|
2018-01-03 15:36:51 +01:00 |
|
|
omar
|
9fbecac87e
|
Demo: Improved Selectable() examples. (#1528)
|
2018-01-03 15:11:14 +01:00 |
|
|
omar
|
33f7769d85
|
Columns: Clear offsets data when columns count changed. (#1525)
|
2018-01-03 14:38:01 +01:00 |
|
|
omar
|
f9b2058d5a
|
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
|
2018-01-03 14:35:11 +01:00 |
|
|
omar
|
79d38e5ade
|
Updated copyright date for 2018
|
2018-01-03 14:32:16 +01:00 |
|
|
omar
|
05ec0b0736
|
Casing tweaks + clarify license copyright (simpler/safer?) (#1346)
|
2018-01-03 14:32:16 +01:00 |
|
|
omar
|
3c6fbe0849
|
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
|
2018-01-03 12:31:56 +01:00 |
|
|
omar
|
7fcbd45500
|
Internals: NextWindow: Renamed, moved functions to member.
|
2018-01-03 12:28:16 +01:00 |
|
|
omar
|
e339949de1
|
Internals: NextWindow: Using ImGuiCond for consistency.
|
2018-01-03 12:22:02 +01:00 |
|
|
omar
|
04b44398eb
|
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
|
2018-01-03 12:12:41 +01:00 |
|
|
omar
|
170bcb2d7c
|
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
|
2018-01-02 12:48:38 +01:00 |
|
|
omar
|
4af84ac781
|
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527)
|
2017-12-30 23:10:11 +01:00 |
|
|
omar
|
6ec00a366a
|
Internals: ImRect: Minor formatting tweaks.
|
2017-12-29 18:28:04 +01:00 |
|
|
omar
|
fbf2435f38
|
Exposed IM_OFFSETOF() helper in imgui.h
|
2017-12-29 18:16:19 +01:00 |
|
|
omar
|
eef9120e07
|
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
|
2017-12-29 18:14:36 +01:00 |
|
|
omar
|
2dd2ca0096
|
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e.
|
2017-12-29 17:59:13 +01:00 |
|
|
omar
|
9f8632b131
|
Examples: Comments about invalid mouse pos.
|
2017-12-29 15:03:36 +01:00 |
|
|
omar
|
4fbdb50dca
|
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
|
2017-12-28 23:53:36 +01:00 |
|
|
omar
|
4ba2e85744
|
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
|
2017-12-28 23:53:27 +01:00 |
|
|
omar
|
90ff4ae5d1
|
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
|
2017-12-28 23:52:47 +01:00 |
|