Commit Graph

6539 Commits (df2319a854e543f2e83f51f483a4fb1fba37111a)
 

Author SHA1 Message Date
omar 3ed2ddbfbe Metrics: Removed context size display.
omar d3e826c247 Examples: Updated for reorganized context functions. Calling CreateContext(), DestroyContext() in example code. Removed Shutdown() from binding code. (, , , , )
omar 5e2aa6185c Reorganized context handling to be more explicit,
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(, , , , )
omar 7e4d28a49d Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. (, , , , )
omar e45d7a7060 Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. (, , , , )
omar 5a301c29dc Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. (, , , , )
omar ac5b7a1bdf Comments
omar 8b64d50cc4
Merge pull request from PanosK92/master
Simplified return of ImGui::IsKeyReleased().
Panos Karabelas 7c8a19978d Simplified return of ImGui::IsKeyReleased()
omar 5eb293c879 ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
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! ()
omar 7e7c017b75 Examples: Simplified mouse wheel handling. ()
omar 7dea158175 Examples: Allegro, Apple, DirectX9/10/11, Glfw+Vulkan :Added support for horizontal mouse wheel. ()
omar 0b1fecb792 Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ()
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
omar d4bf9b4686 Renaming for consistency.
omar 8877622fa8 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar e5a6e85f6d Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. ()
omar 42a612d7c9 Begin: Removed asserts that got in the way of some flags combination. ()
omar 0978f00911 MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for as the RootWindow for Child+Tooltip window points to itself now.
omar f3e510a9bf Examples: SDL: Using SDL_CaptureMouse() to retrieve coordinates outside of client area when dragging. ()
Digging into sdl window/mouse stuff will also be useful for multi-viewport work.
omar 00351ee2ab Examples: SDL: Minor renaming.
omar ba99900023 Examples: GLFW+GL2: Renamed imgui_impl_glfw.* to imgui_impl_glfw_gl2.* for consistency and to emphasis on GL2-ness.
omar 79dca9d5e6 Examples: SDL+GL2: Renamed imgui_impl_sdl.* to imgui_impl_sdl_gl2.* for consistency and to emphasis on GL2-ness.
omar 15fd5b6c4c Examples: SDL: Minor renaming.
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. ()
omar 74dc70c543 DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. ()
omar c2ffce3e5a Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. ()
omar 63d47e8328 Drag and Drop: Increased payload type string to 12 characters instead of 8.()
omar 932d3f0198 NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. () + comments.
omar 60d5dc7902 Examples: SDL: Fixed mapping of Insert key (, fix bug introduced in )
omar d1f726cd9d Comments about Begin/End pair and handling of return value.
omar cc15512bfc InputText: Minor tweak.
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. (, )
omar 2f15cc0855 Nav: Fixed popup wrap-around logic for windows with scrolling. ()
omar 05885b2e6d Merge fix.
omar a221d253f3 Nav: Comment.
omar 472ba1394c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar 28a76af185 Internal: DrawData: Tidying, renaming.
omar a77913054f Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 1182174d81 Internals: DrawData: We don't need an intermediate layer for popups.
omar 0c06b43e6b Metrics: Tweaks to hover-window-drawlist to see window bounding box.
omar 038453258e Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
omar 061d8df033 MIssing IMGUI_API for a type with non-inline methods.
omar 06eef2ce6f Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
omar 6eff21ee5e Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ()"
This reverts commit 03f5cd6ca1.
omar 514d30d8cd MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch .
omar 8b432cf590
Merge pull request from Crunkle/master
Fix incorrect header name on Linux MinGW systems.
Crunkle daa38f2ad0 Fix cross compilers
omar db63e71f13 Internals: Exposed SetCurrentFont() in imgui_internal.h