omar
|
8079344cee
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
omar
|
2c38b32db1
|
Removed trailing spaces (#2038, #2299)
|
6 years ago |
omar
|
f94ba546ba
|
Added checks for "zero-as-null-pointer-constant" warnings for older Clang (#2299, followup to #2277)
|
6 years ago |
omar
|
fcd61e0c59
|
Comments about DLL boundaries and using TLS variables for GImGui. (#2292)
|
6 years ago |
omar
|
b5144e477f
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
6 years ago |
omar
|
e9c625a1dc
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
|
6 years ago |
omar
|
d1851ed6b7
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!) [docking branch]
|
6 years ago |
omar
|
32c4e01267
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
6 years ago |
omar
|
06aaf23877
|
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
|
6 years ago |
omar
|
09f1cb642b
|
FreeType: Minor tweaks previous commit (#2285)
|
6 years ago |
omar
|
8a45c56c2c
|
Merge branch 'viewport' into docking
|
6 years ago |
omar
|
9391a97fbf
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
|
6 years ago |
omar
|
79d497edae
|
Viewport: Made platform_io.Monitors mandatory for proper multi-viewport use.
|
6 years ago |
omar
|
95ee99e6aa
|
Version 1.68 WIP
|
6 years ago |
omar
|
515ad62335
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
|
6 years ago |
omar
|
73353fad64
|
Merge branch 'master' into viewport
|
6 years ago |
omar
|
b8c6e31c2d
|
Fixed cursor issue caused by 6890e08b when calling BeginChild/EndChild multiple times to reappend into a same child window. (#2282)
|
6 years ago |
omar
|
ff4bd758ca
|
Merge branch 'viewport' into docking
|
6 years ago |
omar
|
e24674fc0e
|
Merge branch 'master' into viewport
|
6 years ago |
omar
|
7a5058e3bf
|
Version 1.67
|
6 years ago |
omar
|
6e41745f31
|
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. (#2277)
|
6 years ago |
omar
|
529fccd9c2
|
Merge branch 'viewport' into docking
|
6 years ago |
omar
|
4ee4f65c70
|
Merge branch 'master' into viewport
|
6 years ago |
omar
|
49994ceb6e
|
FAQ entry, moved ImTextureId, Gallery links.
|
6 years ago |
omar
|
7cc86d4bc9
|
Docking: Fixed docking a split node into the empty central node of a dockspace leading to the central node tag being incorrectly carried along. (#2109)
|
6 years ago |
omar
|
8011197c50
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
c96aaef132
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
omar
|
1f6e0b2f98
|
ImVector: Made a struct. Using T/T* in the code instead of value_type/iterator. Renamed index_from_pointer() to index_from_ptr() (was not documented, added in 1.63, users not supposed to use ImVector, hopefully not a big deal).
|
6 years ago |
omar
|
61a99f994e
|
Minot internal tweaks, comments
|
6 years ago |
omar
|
f53cd3ee0f
|
Internals: LowerBound: Use raw pointer typedefs, we never use iterator anywhere else in the codebase.
Demo: Typo.
C98 fix.
|
6 years ago |
omar
|
57b1622afc
|
Added IMGUI_USE_STB_SPRINTF (undocumented) (#1038)
|
6 years ago |
omar
|
b33977bc15
|
Tests: Reworking hook prototypes for imgui-test to be faster and multi-context friendly.
|
6 years ago |
omar
|
3997e8b555
|
Fixed animated window titles from being updated when displayed in the CTRL+Tab list. + Adding overkill helpers for reusing buffers. (#787)
|
6 years ago |
omar
|
6b32570644
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
|
6 years ago |
omar
|
5af930f97a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
6 years ago |
omar
|
5cb7ce2085
|
Renamed ImFont::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).
|
6 years ago |
omar
|
c3af134cc8
|
IO: Renamed InputCharacters[], marked internal as was always intended. AddInputCharacter() goes into a queue which can receive as many characters as needed during the frame. This is useful for automation to not have an upper limit on typing speed. Will later transition key/mouse to use the event queue later.
|
6 years ago |
omar
|
9ba202821f
|
Nav: Fixed an keyboard issue where holding Activate/Space for longer than two frames on a button would unnecessary keep the focus on the parent window, which could steal it from newly appearing windows. (#787)
|
6 years ago |
omar
|
d223d1e951
|
Added bindings in Readme. Added internal IMGUI_DEBUG_LOG() helper. Comments, missing breaking changes note relative to imgui_impl_xxxx changes, not really part of core but worth adding in the imgui.cpp breaking change section.
|
6 years ago |
omar
|
515ecbddc2
|
Docking: Fix for handling of orphan/inactive dock node with ConfigDockingTabBarOnSingleWindows (would crash).
|
6 years ago |
omar
|
6777544855
|
Added sanity check to debug parent/child ordering issues (they would generally manifest with an assert/crash in EndFrame bu tthis assert will catch some earlier).
|
6 years ago |
omar
|
5278da98d2
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_demo.cpp
|
6 years ago |
omar
|
e1ed27aeaa
|
(Breaking change) Reorganized Viewports advanced flags, moved into new io.ConfigViewportsXXX flags. Pay attention that ImGuiConfigFlags_ViewportsDecoration became ConfigViewportsNoDecoeration, so the value is inverted! (#1542)
|
6 years ago |
omar
|
c8349d3305
|
Viewport: Added ConfigViewportsNoParent to parent viewport default to NULL and not main viewport. Fix eg.. popups appearing erroneously focusing parent window.
|
6 years ago |
omar
|
606175b98f
|
Viewport: Fix for minimization of individual viewports (the current back-end forcing a parent/child relationship between secondary viewports and the main viewport have hidden this issue). Follows d8ab2c1ac .
|
6 years ago |
omar
|
05bc323be0
|
Viewport: Fixed minimization of main viewport leading to it being omitted from platform_io.Viewport list where the users assume it is at index 0. Fix d8ab2c1ac . It wasn't a problem when other viewports were child of the main viewport because they would all be minimized together. (#1542)
|
6 years ago |
omar
|
599a52629a
|
Viewport: Added minimum viable information in the Changelog.
|
6 years ago |
omar
|
c3efccaa9c
|
Docking: Merge fix duplicate line + added assert to ease debugging.
|
6 years ago |
omar
|
b26f16a27f
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
a0c2e55e8c
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
omar
|
237109caa5
|
Internals: Extracted code out of EndFrame() into UpdateMouseMovingWindowEndFrame()
|
6 years ago |
omar
|
b3469fa94b
|
Alternative fix for bug introduced in d845135 (#1651), fix CTRL+Tab and fallback tooltip.
|
6 years ago |
omar
|
3e30bfd6c9
|
Revert "Fixes crash/assert bug introduced in d845135 (#1651): would assert when showing the CTRL+Tab list and or fallback "...." tooltip."
This reverts commit 1b0e38df47 .
|
6 years ago |
omar
|
1b0e38df47
|
Fixes crash/assert bug introduced in d845135 (#1651): would assert when showing the CTRL+Tab list and or fallback "...." tooltip.
|
6 years ago |
omar
|
5aebfedfad
|
Docking: Forward WindowClass from node to host window.
|
6 years ago |
omar
|
ce1626a51e
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
6 years ago |
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. (#1542)
|
6 years ago |
omar
|
0d6e3ab2b0
|
Docking: Renamed SetNextWindowId() -> SetNextWindowID() for consistency. (function vs member are still horribly inconsistent atm)
|
6 years ago |
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.
|
6 years ago |
omar
|
5305c32242
|
Viewport: Reorder flags. Set owned viewport common decoration flags in Begin(). Moved code in UpdateViewportsEndFrame() before we introduce family/class based overrides.
|
6 years ago |
omar
|
951c9dd68b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
6 years ago |
omar
|
4ea9fdbbea
|
Docking: Agressively assert when CentralNode is a not a leaf node in order to find our bug.
|
6 years ago |
omar
|
e194219f2e
|
Renamed ImGuiDockFamily to ImGuiWindowClass. Renamed CompatibleWithClassZero to DockingAllowUnclassed. (#2109)
|
6 years ago |
omar
|
6b97ded438
|
Happy new year! & comments
|
6 years ago |
omar
|
e21bc44684
|
Comments: fixed missing line in the "how a simple rendering function may look like" section (#2258)
|
6 years ago |
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. (#1651).
|
6 years ago |
omar
|
a9a60a24c1
|
Tweaked asserts
|
6 years ago |
omar
|
a71d3c8cb3
|
Viewport: Misc comments following user feedbacks..
|
6 years ago |
omar
|
238321c159
|
Fix merge in Docking branch, remove ConfigDockingWithShift flag from DX11 example + misnamed function.
|
6 years ago |
omar
|
81a2546cea
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_win32_directx9/main.cpp
|
6 years ago |
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
|
6 years ago |
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(). (#1542)
|
6 years ago |
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.
|
6 years ago |
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). (#2246, #2109)
|
6 years ago |
omar
|
e043b89814
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.h
|
6 years ago |
omar
|
02501f07c3
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
omar
|
a0e5bb9532
|
Viewport: Corrected/clarified comments. Moved RenderPlatformWindowsDefault() next to UpdatePlatformWindow(). Removed unnecessary flag check.
|
6 years ago |
omar
|
5691385a33
|
IO: Added BackendPlatformUserData, BackendRendererUserData, BackendLanguageUserData void* for storage use by back-ends. (#2004 + for cimgui)
|
6 years ago |
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
|
6 years ago |
omar
|
89ac0ea7c1
|
Various user-facing comments
|
6 years ago |
omar
|
84d1ce3958
|
Tidying up README, moved entries to FAQ, updated screenshots, removed comma in title.
|
6 years ago |
omar
|
ca953f0fee
|
Fix merge issue on master.
|
6 years ago |
omar
|
088ef6623a
|
Merge branch 'viewport' into docking
|
6 years ago |
omar
|
9c916cdaf9
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
ae76a1fda7
|
Window, Focus, Popup: Fixed an issue where closing a popup by clicking another window with the _NoMove flag would refocus the parent window of the popup instead of the newly clicked window.
|
6 years ago |
omar
|
510ca373a2
|
Moved setting up NavHideHighlightOneFrame from lower-level ClosePopupToLevel() to CloseCurrentPopup() with an explanation. (Followup on 68d3e139a7 )
|
6 years ago |
omar
|
ac9512e095
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
65dac02171
|
Internals: Popups: Renamed CurrentPopupStack to BeginPopupStack which is much less ambiguous.
|
6 years ago |
omar
|
f1c7596409
|
Internals: Popup related comments. Renamed the misleading internal ClosePopup() function. Added bool* test to BeginPopupModal in demo.
|
6 years ago |
omar
|
5d20da1b36
|
Viewport, DPI: Now using DpiScale from the ImGuiPlatformMonitor array instead of calling Platform_GetWindowDpiScale() before the platform window creation. Might even tentatively see if things work out without Platform_GetWindowDpiScale. (#1676)
|
6 years ago |
omar
|
587506dd57
|
Tests: Changed prototype of ImGuiTestEngineHook_ItemAdd to match functions called in same spot. Made ButtonBehavior submit fallback item info if ItemAdd() was not called (for resize grips, resize borders, scrollbar, columns, etc.)
|
6 years ago |
omar
|
9b09c7597f
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
omar
|
2a1e903f43
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.h
|
6 years ago |
omar
|
8497948ba0
|
Comments, minor tweaks.
|
6 years ago |
omar
|
e50894c95e
|
Metrics: Fixed crash when viewports are disabled (g.MouseLastHoveredViewport is never set).
|
6 years ago |
omar
|
991b16cc6a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_widgets.cpp
|
6 years ago |
omar
|
febc3e6aa1
|
Internals: Windows hidden with HiddenFramesRegular (but NOT HiddenFramesForResize) preserve their SizeContents, so restoring a auto-resize window after it's been hidden by tabs won't reset its size for a frame. Arguable. Let's see how it goes. (Followup to b48e295bddbf965d7382ec5578ed05d2fe601114)
|
6 years ago |
omar
|
d9a84de9d9
|
Contents size is preserved while a window collapsed. Fix auto-resizing window losing their size for one frame when uncollapsed.
|
6 years ago |
omar
|
067b691fd8
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
6 years ago |
omar
|
c40feabe4d
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |