Commit Graph

  • 7e4d28a49d Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (#1565, #586, #992, #1007, #1558) omar 2018-01-21 19:44:48 +0100
  • e45d7a7060 Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (#1565, #586, #992, #1007, #1558) omar 2018-01-21 18:54:22 +0100
  • 5a301c29dc Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (#1565, #586, #992, #1007, #1558) omar 2018-01-20 21:41:46 +0100
  • ac5b7a1bdf Comments omar 2018-01-21 19:53:02 +0100
  • 8b64d50cc4
    Merge pull request #1564 from PanosK92/master omar 2018-01-21 17:20:44 +0100
  • 7c8a19978d Simplified return of ImGui::IsKeyReleased() Panos Karabelas 2018-01-21 16:02:09 +0000
  • 92d4546fa8 Adding mecahnism for scoped push/pop. Added usage to demo. Ziv Shahaf 2018-01-21 16:04:11 +0200
  • 5eb293c879 ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight) omar 2018-01-20 20:32:23 +0100
  • 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) omar 2018-01-20 20:25:12 +0100
  • fe4613f069
    Add text alignment to SliderFloat just like Button stfx 2018-01-20 16:49:41 +0100
  • 7e7c017b75 Examples: Simplified mouse wheel handling. (#1463) omar 2018-01-20 12:45:31 +0100
  • 7dea158175 Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. (#1463) omar 2018-01-20 12:36:59 +0100
  • 0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. (#1463) omar 2018-01-20 12:36:16 +0100
  • 6f6b6194b2 Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel omar 2018-01-20 12:06:06 +0100
  • d4bf9b4686 Renaming for consistency. omar 2018-01-19 15:47:10 +0100
  • 8877622fa8 Merge branch 'master' into navigation omar 2018-01-19 15:42:28 +0100
  • e5a6e85f6d Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. (#1345) omar 2018-01-19 15:37:25 +0100
  • 42a612d7c9 Begin: Removed asserts that got in the way of some flags combination. (#1345) omar 2018-01-19 15:33:35 +0100
  • 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. omar 2018-01-19 15:06:39 +0100
  • 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. omar 2018-01-19 10:46:54 +0100
  • 00351ee2ab Examples: SDL: Minor renaming. omar 2018-01-19 09:53:55 +0100
  • ba99900023 Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness. omar 2018-01-19 09:48:23 +0100
  • 79dca9d5e6 Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness. omar 2018-01-19 09:45:27 +0100
  • 15fd5b6c4c Examples: SDL: Minor renaming. omar 2018-01-19 09:43:28 +0100
  • 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) omar 2018-01-19 09:25:31 +0100
  • 74dc70c543 DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. (#1559) omar 2018-01-19 09:16:26 +0100
  • c2ffce3e5a Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. (#143) omar 2018-01-18 17:39:40 +0100
  • 63d47e8328 Drag and Drop: Increased payload type string to 12 characters instead of 8.(#143) omar 2018-01-18 17:32:34 +0100
  • 932d3f0198 NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. (#1555) + comments. omar 2018-01-18 10:06:58 +0100
  • 60d5dc7902 Examples: SDL: Fixed mapping of Insert key (#1555, fix bug introduced in #1541) omar 2018-01-18 10:01:36 +0100
  • d1f726cd9d Comments about Begin/End pair and handling of return value. omar 2018-01-17 12:46:07 +0100
  • cc15512bfc InputText: Minor tweak. omar 2018-01-17 12:15:24 +0100
  • 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) omar 2018-01-17 12:15:00 +0100
  • f3007382d2 Merge 15ebbd1f78 into 28a76af185 Phil Cooper-King 2018-01-16 23:54:58 +0000
  • c2f77e28d2 Merge a24c17035a into 28a76af185 Sam Hocevar 2018-01-16 23:52:07 +0000
  • 2f15cc0855 Nav: Fixed popup wrap-around logic for windows with scrolling. (#787) omar 2018-01-15 21:55:32 +0100
  • 05885b2e6d Merge fix. omar 2018-01-15 20:18:01 +0100
  • a221d253f3 Nav: Comment. omar 2018-01-15 19:09:40 +0100
  • 472ba1394c Merge branch 'master' into navigation omar 2018-01-15 20:13:42 +0100
  • 28a76af185 Internal: DrawData: Tidying, renaming. omar 2018-01-15 19:09:10 +0100
  • a77913054f Merge branch 'master' into navigation omar 2018-01-15 18:02:58 +0100
  • 1182174d81 Internals: DrawData: We don't need an intermediate layer for popups. omar 2018-01-15 18:00:13 +0100
  • 0c06b43e6b Metrics: Tweaks to hover-window-drawlist to see window bounding box. omar 2018-01-15 17:55:38 +0100
  • 038453258e Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse. omar 2018-01-15 17:48:07 +0100
  • 061d8df033 MIssing IMGUI_API for a type with non-inline methods. omar 2018-01-15 17:29:18 +0100
  • 06eef2ce6f Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy). omar 2018-01-15 17:25:11 +0100
  • 6eff21ee5e Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787)" omar 2018-01-15 16:19:01 +0100
  • 514d30d8cd MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345. omar 2018-01-14 14:13:54 +0100
  • 8b432cf590
    Merge pull request #1551 from Crunkle/master omar 2018-01-14 11:26:03 +0100
  • daa38f2ad0 Fix cross compilers Crunkle 2018-01-14 03:31:22 +0000
  • db63e71f13 Internals: Exposed SetCurrentFont() in imgui_internal.h omar 2018-01-12 20:07:01 +0100
  • 1493de4f81 Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper. omar 2018-01-12 19:53:27 +0100
  • c85d7d6e49 Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 (#787) omar 2018-01-12 19:28:37 +0100
  • c9be7d7254 Merge branch 'master' into navigation omar 2018-01-12 19:21:12 +0100
  • 0a98202714 Nav: Standardized FIXME-NAV marker. omar 2018-01-12 19:13:15 +0100
  • 16285603f2 Internals: Initializing fields in same order as declaration order + fixed uninitialized DragDropAcceptIdCurrRectSurface (was harmless) omar 2018-01-12 19:11:11 +0100
  • 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) omar 2018-01-11 23:21:24 +0100
  • 5e9ae92ae9 Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). (#822, #1542) omar 2018-01-11 23:17:34 +0100
  • 01d899d59d Merge 7411207205 into 6a1011cf53 Nick Dandoulakis 2018-01-11 20:20:07 +0000
  • 7411207205
    FindRenderedTextEnd: fixed null text issue Nick Dandoulakis 2018-01-11 22:12:25 +0200
  • f7b10fc954 Merge branch 'master' into navigation omar 2018-01-11 18:18:44 +0100
  • 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) omar 2018-01-11 18:16:16 +0100
  • b74f24c3e5 Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337)" omar 2018-01-11 18:08:14 +0100
  • 1c95dea88c Merge branch 'master' into navigation omar 2018-01-11 17:37:02 +0100
  • 7d2a068dea Begin: Shuffling bits of code around. omar 2018-01-11 17:33:37 +0100
  • cd7e178eac Merge branch 'master' into navigation omar 2018-01-11 16:49:59 +0100
  • 651538e13b Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381, #1337) omar 2018-01-11 16:43:03 +0100
  • a8bbb0b7dd Demo: Using IM_COL32() instead of ImColor() in ImDrawList centric contexts. omar 2018-01-11 15:47:07 +0100
  • 12aa3cb09e Demo: Tweaks format. omar 2018-01-11 15:22:33 +0100
  • 398a4e1865 Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. (#1382) omar 2018-01-11 13:58:25 +0100
  • a63fbbca8b Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. (#1382) omar 2018-01-11 13:49:32 +0100
  • 67671c0ab5 Merge branch 'master' into navigation omar 2018-01-10 23:11:26 +0100
  • 1eee10778b Internals: Begin: Refactor some code into an UpdateManualResize() function. omar 2018-01-10 23:06:51 +0100
  • 483f9b0d07 Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible. omar 2018-01-10 22:55:29 +0100
  • bc90a3eeae Tabs: Fixes for the old Tabs branch, for good measure. omar 2018-01-10 19:10:42 +0100
  • dd071e14a2 Merge branch 'master' into tabs omar 2018-01-10 19:09:00 +0100
  • 03f5cd6ca1 Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. (#787) omar 2018-01-09 00:05:04 +0100
  • 919fc548ad Merge branch 'master' into navigation omar 2018-01-10 18:58:26 +0100
  • 6c583315e6 Begin: Moving some code around for the benefits of the wip viewport branch. omar 2018-01-10 18:56:51 +0100
  • f610e25682 Internals: Using ImFloor().when appropriate. omar 2018-01-10 16:11:29 +0100
  • 0cabd81071 Internals: Rect: Added ClipWillFull helper + comments on variations. omar 2018-01-08 23:59:51 +0100
  • 92d75c44bc Internals: ImVec2 versions of ImMin, ImMax inline float version for a faster full-on-debug-no-inline experience. omar 2018-01-08 23:59:12 +0100
  • fe919995da Merge branch 'master' into navigation omar 2018-01-08 16:35:12 +0100
  • 933ee6cd5d InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). (#1541) omar 2018-01-08 16:01:02 +0100
  • fd4d63a0c5 InputText: Moved code for checking clipboard shortcut so we can expand on it. (#1541) omar 2018-01-08 15:54:41 +0100
  • ce95b84825 Added ImGuiKey_Insert for future use. Setup in all example bindings. (#1541) omar 2018-01-08 15:30:39 +0100
  • 945b89693f Merge 65afff864f into 39cb56c39e Jiří Šebele 2018-01-07 18:09:57 +0000
  • 39cb56c39e Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466) omar 2018-01-07 19:06:20 +0100
  • 7484c63449 Examples: OpenGL3+SDL: Changed GLSL shader version to 150 (#1466, #1504) omar 2018-01-07 19:05:42 +0100
  • 168200f915 Popups: Comments, reorganize bits of the header section, renamed parameters. omar 2018-01-07 18:15:43 +0100
  • a8e5542d78 BeginPopup: Exposed extra_flags publicly. (#1533) omar 2018-01-07 18:13:01 +0100
  • 3f4eccf154 Merge branch 'master' into navigation omar 2018-01-07 16:22:09 +0100
  • 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) omar 2018-01-07 16:20:02 +0100
  • deab2ab015 Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). (#1497) omar 2018-01-07 16:15:54 +0100
  • 69ff65f054 Internals: Popup: Renaming fields. omar 2018-01-07 16:11:25 +0100
  • 3678307cd9 Popup, Menus: Tweaks and comments. omar 2018-01-07 15:56:14 +0100
  • 369189b675 Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion. omar 2018-01-07 15:40:46 +0100
  • 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) omar 2018-01-07 15:34:15 +0100
  • 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) omar 2018-01-07 15:22:54 +0100
  • c337cdcfd3 Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently omar 2018-01-07 15:02:09 +0100