Commit Graph

6653 Commits (2665288b30bfc7ac130699b791598d7753544db4)
 

Author SHA1 Message Date
omar b26f16a27f Merge branch 'viewport' into docking
# Conflicts:
#	imgui.cpp
omar a0c2e55e8c Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 237109caa5 Internals: Extracted code out of EndFrame() into UpdateMouseMovingWindowEndFrame()
omar b3469fa94b Alternative fix for bug introduced in d845135 (), fix CTRL+Tab and fallback tooltip.
omar 3e30bfd6c9 Revert "Fixes crash/assert bug introduced in d845135 (): would assert when showing the CTRL+Tab list and or fallback "...." tooltip."
This reverts commit 1b0e38df47.
omar 1b0e38df47 Fixes crash/assert bug introduced in d845135 (): would assert when showing the CTRL+Tab list and or fallback "...." tooltip.
omar 5aebfedfad Docking: Forward WindowClass from node to host window.
omar ce1626a51e Merge branch 'viewport' into docking
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
omar 0cabe4dedf Viewport: Added ImGuiWindowClass / SetNextWindowClass() (concept imported from Docking ImGuiDockFamily), which currently allows to overwrite viewport flags on a per-window basis. Exposed FindViewportByID(). Win32: Support for ParentViewportId. ()
omar 0d6e3ab2b0 Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
omar cfcad42b89 Viewport: Win32: Workaround to the fact that ::WindowFromPoint() seems to return Windows using ImGuiViewportFlags_NoInputs / HTTRANSPARENT when dragging nearby the platform title bar. This is to allow using platform decoration. I don't understand this well atm. ()
omar 4a6f95acc8 Viewport: Added Platform_UpdateWindow hook for general purpose: Rework Win32 code to reflect viewport flags changes into Win32 while the window is active.
omar 5305c32242 Viewport: Reorder flags. Set owned viewport common decoration flags in Begin(). Moved code in UpdateViewportsEndFrame() before we introduce family/class based overrides.
omar 951c9dd68b Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_sdl.cpp
omar 4ea9fdbbea Docking: Agressively assert when CentralNode is a not a leaf node in order to find our bug.
omar e194219f2e Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. ()
omar d9a4cbc429 Examples: Comments about GLFW/SDL versions
omar c017a4fb5f Moved guidelines to issue to Pin and increase visibility for now.
omar acacd93836 Renamed extra_flags to flags in InputXXX parameters.
omar c738f9ef92 InputFloat: When using ImGuiInputTextFlags_ReadOnly the step buttons are disabled. ()
omar 6b97ded438 Happy new year! & comments
omar e21bc44684 Comments: fixed missing line in the "how a simple rendering function may look like" section ()
omar d845135273 Error recovery: Extraneous/undesired calls to End() are now being caught by an assert in the End() function itself at the call site (instead of being reported in EndFrame). Past the assert, they don't lead to crashes any more. Missing calls to End(), pass the assert, should not lead to crashes any more, nor to the fallback/debug window appearing on screen. ().
omar a9a60a24c1 Tweaked asserts
omar a71d3c8cb3 Viewport: Misc comments following user feedbacks..
omar 238321c159 Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
omar e181b0c3fc Merge branch 'viewport' into docking
omar 2889a14f86 Build fix for master.
omar 9d0bc3f9ab Merge branch 'master' into viewport
# Conflicts:
#	examples/imgui_impl_sdl.cpp
omar b1cd52b674 Examples: SDL: Avoid testing for SDL_GetKeyboardFocus() on Android and iOS (like Emscripten). ()
omar afe9c5c5f7 Examples: SDL: Fixed compilation for SDL 2..0.3 and less (running on our test servers) and clarified a bit of the messy situation. Followup to 8dd83c5. (, )
omar 81a2546cea Merge branch 'viewport' into docking
# Conflicts:
#	examples/example_allegro5/main.cpp
#	examples/example_win32_directx9/main.cpp
omar ee5560a958 Merge branch 'master' into viewport + added style tweak block when viewports are enabled
# Conflicts:
#	examples/example_glfw_opengl3/main.cpp
#	examples/example_sdl_opengl3/main.cpp
#	examples/example_win32_directx11/main.cpp
omar d5b22fb635 Examples: Setting up style before bindings, so in complex binding (vulkan/dx12) it isn't miles away from the context creation.
omar 62cfdceac1 Examples: Viewport: Moved the "make current GL context" to reduce the amount of call and hopefully be more explicit about viewport enabled vs disabled requirements. ()
omar d9fda22763 Viewport: Fixed not clearing request flags in main viewport, which led some back-end (SDL) to break on resize as PlatformRequestResize would stay true forever and inhibit new sizes passed to AddUpdateViewport(). ()
omar 8dd83c5fe8 Examples: SDL: SDL_GetMouseState() seems problematic, movements feels laggy in the non-viewport code path. (, )
omar b471813f54 Made it illegal to call Begin("") with an empty string. This somehow accidentally worked before but had various undesirable side-effect as the window would have ID zero. In particular it is causing problems in viewport/docking branches.
omar 5794c0491a Docking: Fix an edge case failing to dock into an explicit dockspace which only have inactive nodes (because all the windows are inactive). (, )
omar e043b89814 Merge branch 'viewport' into docking
# Conflicts:
#	imgui.h
omar 8fc19d2194 Removed IMGUI_HAS_TABS from Docking branch, it's not defined anywhere anymore.
omar 02501f07c3 Merge branch 'master' into viewport
# Conflicts:
#	imgui.cpp
#	imgui.h
omar a0e5bb9532 Viewport: Corrected/clarified comments. Moved RenderPlatformWindowsDefault() next to UpdatePlatformWindow(). Removed unnecessary flag check.
omar 39dde66b21 IO: Realigned all fields, very minor comments change. This is nearly a no-op if you don't ignore Spaces.
omar 5691385a33 IO: Added BackendPlatformUserData, BackendRendererUserData, BackendLanguageUserData void* for storage use by back-ends. ( + for cimgui)
omar 8399fb5071 Changed ImGuiCol_ChildBg to (0,0,0,0) in Dark style instead of (1,1,1,0), to match other styles. Shouldn't have any effect for the end-user.
omar 6890e08bc5 Fixed using SetNextWindowPos() on a child window (which wasn't really documented) position the cursor as expected in the parent window, so there is no mismatch between the layout in parent and the position of the child window. Demo tweak and adding some child window stuff
omar 89ac0ea7c1 Various user-facing comments
omar 84d1ce3958 Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
omar ca953f0fee Fix merge issue on master.