ocornut
835a5344b0
Merge branch 'master' into docking
...
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
3 years ago
ocornut
65ad63de84
Added ImGuiFocusedFlags_NoPopupHierarchy and ImGuiHoveredFlags_NoPopupHierarchy (followup #4527 )
...
IsWindowFocused: fix flag usage (amend 6b1e094c
) was technically harmless because of light typing.
3 years ago
ocornut
fc4988ffb0
Added ImGuiFocusedFlags_NoPopupHierarchy and ImGuiHoveredFlags_NoPopupHierarchy (followup #4527 )
3 years ago
ocornut
24a77824f2
Added ClosePopupsExceptModals() helper, unused for now (aimed at user being able to close popups on app focus loss, not necessarily a suitable default)
3 years ago
ocornut
bbb95a5e06
IO: modify io.AddFocusEvent() to tolerate in/out for multi-viewports. Amend 2f40be6
. (merged from docking) ( #3532 )
3 years ago
ocornut
ca097c2c68
Docking: Fixed IsItemHovered() and functions depending on it (e.g. BeginPopupContextItem()) when called after Begin() on a docked window ( #3851 )
...
Fix ee643b2a
3 years ago
ocornut
fba756176d
Backends: SDL_Renderer: Amend 1d2d246, various tweaks, fixes, sync to latest. ( #3926 )
3 years ago
Sylvain
62b17f928e
Backends: SDL_Renderer: Added renderer backend for SDL 2.0.17+ ( #3926 )
...
(Squashed 20 commits)
3 years ago
Martin Ejdestig
d7260104b1
Added comments about sliders clamping and ImGuiSliderFlags_AlwaysClamp ( #4573 )
3 years ago
Rokas Kupstys
15fe7ba31f
ColorPicker: Fix not being able to pick exactly (1.0f, 1.0f, 1.0f) color by dragging toward the edges of the SV square. ( #3517 )
...
Old code attempted to mitigate hue/saturation resetting for colors where these components are undefined. Since we now explicitly back up and restore these components this workaround is no longer necessary.
3 years ago
Rokas Kupstys
30546bc0e7
ColorEdit: Fix multiple issues. ( #4014 )
...
* Change g.ColorEditLastColor type to ImU32 and store RGB color value.
- Fixes inability to change hue when saturation is 0. (#4014 )
- Fixes edgecases where lossy color conversion prevent restoration of hue/saturation.
- Fixes hue value jitter when modifying color using SV square.
* Fix hue resetting to 0 when it is set to 255 by explicitly restoring hue if it is 0 and previous value was 1.
* Further reduce hue jitter by restoring hue when color is modified using SV square.
3 years ago
ocornut
15132217a3
Nav: Fixed an issue with losing focus on docked windows when pressing Alt while keyboard navigation is disabled. ( #4547 , #4439 )
3 years ago
ocornut
fa0a314f59
Nav: Fixed an issue with losing focus on docked windows when pressing Alt while keyboard navigation is disabled. ( #4547 , #4439 )
3 years ago
James McCartney
bc3d267c51
Backends: OSX: Use mach_absolute_time as CFAbsoluteTimeGetCurrent can jump backwards. ( #4557 , #4563 )
3 years ago
ocornut
c6ca327fb2
Backends: Added more implicit asserts to detect invalid/redundant calls to Shutdown functions. ( #4562 )
3 years ago
ocornut
ddddabdccf
InputText: amend validation test to allow pushing Activate events remotely. ( #4552 , #2321 )
3 years ago
ocornut
2cffcbdc64
InputText: fix Space key with nav enabled interfering with input text boxes (fix bd6c9e99
). made it possible to activate InputText with tweak gamepad button (why not, now that we can cancel) ( #4552 , #2321 )
3 years ago
ocornut
3973de7933
Internals: removed last parameter to IsClippedEx() + fix PVS studio warnings.
3 years ago
ocornut
2d0a6a4969
Misc: moved StacSizeOnBegin out of window instance into window stack data.
3 years ago
ocornut
66cd21db88
Misc: extracted ErrorCheckEndWindowRecover() out of ErrorCheckEndFrameRecover(). ( #1651 )
3 years ago
ocornut
d366694062
Disabled: Added assert guard for mismatching BeginDisabled()/EndDisabled() blocks. ( #211 ) + Added asserts for missing PopItemFlag() calls. Added both to ErrorCheckEndFrameRecover ( #1651 )
3 years ago
ocornut
4f10fe0a27
TreePush: removed arbitrary/weird suppot for TreePush((const char*)NULL)
3 years ago
ocornut
c58fb46411
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
3 years ago
ocornut
e7cc534367
Docking: Improved resizing system so that non-central zone are better at keeping their fixed size.
3 years ago
ocornut
29828d0469
Docking: floating node with a central node hides properly when nothing is docked + rename.
3 years ago
ocornut
7b8bc864e9
Menus: Fixed vertical alignments of MenuItem() calls within a menu bar. (broken by f8fae022
). ( #4538 )
3 years ago
ocornut
8dfb52245b
Docking: bits.
3 years ago
ocornut
82754561e2
Nav: Fixed a few widgets from not setting reference keyboard/gamepad navigation ID when activated with mouse.
3 years ago
ocornut
5d95e7eef9
Viewports: extracted DestroyViewport() out of UpdateViewportsNewFrame() function.
3 years ago
ocornut
92a39f78b9
Fixed IsWindowFocused/IsWindowHovered with _ChildWindows for not following through popup parents (amend 6b1e094c
, fix #4527 )
3 years ago
ocornut
17a7084b57
Menus: Fixed crash when navigating left inside a child window inside a sub-menu. ( #4510 ).
3 years ago
ocornut
79d39b190b
Viewports: fix window with viewport ini data immediately merged into a host viewport from leaving a temporary viewport alive for a frame (would leak into backend).
3 years ago
ocornut
6b77668171
Viewports: Fixed a crash while a window owning its viewport disappear while being dragged.
...
t would manifest when e.g. reconfiguring dock nodes while dragging.
3 years ago
ocornut
9a49c1ddbd
Viewports: fixed unnecessary creation of temporary viewports when multiple docked windows got reassigned to a new node (created mid-frame) which already has a HostWindow
3 years ago
ocornut
6b1e094cfb
Fixed _ChildWindows from leaking docking hierarchy. Added ImGuiFocusedFlags_DockHierarchy and ImGuiHoveredFlags_DockHierarchy.
3 years ago
ocornut
cfb837203c
Internals: refactored IsWindowHovered()/IsWindowFocused() to make their logic more similar + change underlying value of ImGuiHoveredFlags_AllowWhenBlockedByPopup + comment out docking only flags.
3 years ago
ocornut
321b84f01f
Internals: refactored IsWindowHovered()/IsWindowFocused() to make their logic more similar + change underlying value of ImGuiHoveredFlags_AllowWhenBlockedByPopup + comment out docking only flags.
3 years ago
ocornut
40caab4748
Fixed bad merge of Changelog in docking branch
3 years ago
ocornut
fa9fc05ac6
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
3 years ago
ocornut
d9b427cce0
Nav: clarified/renamed NavInputId as NavAcivateInputId, added flags shared by both.
...
(this commit should have no visible side effect but is designed to introduce the followup commit refactoring SetKeyboardFocusHere into using a Nav request)
3 years ago
ocornut
755bf985d2
Backends: OpenGL3: Made our custom GL loader a bit more tolerant of use of another loader in same compilation unit. ( #4445 , #4514 )
3 years ago
ocornut
607ad8c949
Drag and Drop: Fixed using BeginDragDropSource() within a Begin()/BeginChild() that returned false. ( #4515 ) + BeginDragDropTarget()
...
Note how 79ae6d3b
adedd a SkipItems test in BeginDragDropTargetCustom() only.
Catching this similar to work needed to neatly represent the error in #4375 #4158 , #4008 , #2562
3 years ago
ocornut
bd6c9e99fc
InputText: Allow cancelling/validating input with gamepad nav events.
...
Amend 158995f2
(#2321 )
3 years ago
ocornut
0a154b30ad
Nav, ButtonBehavior: reworked old code which ended up 1) calling SetActiveId repeately and 2) misleadingly set g.NavActivateId (amend af38749e
)
3 years ago
ocornut
ade4c15eea
Nav: Tidying up, renaming + update AnyRequest flag in NavMoveRequestSubmit().
3 years ago
ocornut
528104a89b
Menus: adjust closing logic to accomodate for varying font size and dpi + remove seemingly redundant use of g.NavActivateId where pressed was enough.
3 years ago
ocornut
5ee40c8d34
Nav: always disable highlight if nav is disabled, fix for IMGUI_DEBUG_NAV_SCORING, minor renaming.
3 years ago
ocornut
dff15acdb5
Nav: Fixed toggling menu layer with Alt exiting menu layer with Esc not moving mouse when NavEnableSetMousePos config flag is set.
3 years ago
ocornut
3d9d3b49ae
Internals: folded ImGuiItemAddFlags into ImGuiItemFlags. ImGuiItemAddFlags_Focusable > ImGuiItemFlags_Inputable. One step in the big nav/tab/focus rework.
...
Bonus simplified Selectable() handling of its custom disabled flag. (#211 )
3 years ago
ocornut
73a5e82e04
Nav: removed parameters from NavScoreItem(), NavProcessItem(), NavApplyItemToResult(): made little sense / misleading because pulling from other current state anyway.
...
Will readd in a more thorough manner is actually needed.
3 years ago