omar
|
352695bc57
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-07-24 16:50:49 +02:00 |
|
omar
|
357534e588
|
Made it possible to move a window by dragging from the Collapse button (past the drag threshold). Extracted some code out to a CollapseButton() function.
|
2018-07-24 16:45:11 +02:00 |
|
omar
|
3a522b2400
|
Internals: Renamed one of the arrow functions so their name don't collide.
|
2018-07-24 16:41:17 +02:00 |
|
omar
|
528b50a89f
|
Fixed horizontal mouse wheel not forwarding the request to the parent window if ImGuiWindowFlags_NoScrollWithMouse is set. (#1463, #1380, #1502)
|
2018-07-22 19:04:15 +02:00 |
|
omar
|
4b8ce24e46
|
Internals: Extracted part of NewFrame() into a UpdateMouseWheel() function.
|
2018-07-22 18:57:28 +02:00 |
|
omar
|
4ebd442a24
|
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958)
|
2018-07-22 18:53:27 +02:00 |
|
omar
|
e07f5d4c78
|
Changed ImGui::GetTime() return value from float to double to avoid accumulating floating point imprecisions over time.
|
2018-07-22 18:46:41 +02:00 |
|
omar
|
74077491ce
|
Viewport: Fixed a situation when the implicit Debug window can hold on a zombie viewport which platform window is not properly destroyed. (#1542)
|
2018-07-22 16:24:06 +02:00 |
|
omar
|
048add5ef2
|
ImGuiTextFilter, TextRange: removed cruft from TextRange since it's not a publicly and generic helper at the moment + marked internal stuff + changed a reference to a pointer. (#1879)
|
2018-07-19 15:22:18 +02:00 |
|
omar
|
23b67e6ff5
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-17 19:52:14 +02:00 |
|
omar
|
93321d3280
|
Nav: Fixed CTRL+TAB windowing list from always showing the implicit Debug window. (#787)
|
2018-07-17 19:48:53 +02:00 |
|
Rokas Kupstys
|
7e59eb026b
|
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)
|
2018-07-17 17:17:56 +02:00 |
|
omar
|
7b4fbf4301
|
Viewport: Removed the need for the back-end to fill io.MousePosViewport, it seems unnecessary at this point. (#1542)
|
2018-07-17 16:37:10 +02:00 |
|
omar
|
b8b74970d7
|
Internals: Viewport: Renamed g.MouseRefViewport to g.MouseViewport. (#1542)
|
2018-07-17 16:04:47 +02:00 |
|
omar
|
defbf1c4b3
|
Viewport: when moving window we use the moving window viewport unless drag and dropping. This is to fix e.g. IsItemHovered() + Tooltip pattern that may be active while moving a window. (#1542)
|
2018-07-17 15:56:02 +02:00 |
|
omar
|
16c6734bcb
|
Viewport: Revert part of 7abf72e, the viewport ownership stealing is problematic. (#1542). Will rework in the context of docking. (+1 squashed commits)
+ Fixed unused prototype warning (left-over from a merge)
|
2018-07-17 15:14:19 +02:00 |
|
omar
|
b30b82835a
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2018-07-12 11:48:49 +02:00 |
|
omar
|
d107146687
|
Viewport: Fixed CTRL+TAB windowing list displaying too many dimming layers (fix dd61c48 for viewport branch)
|
2018-07-12 11:19:17 +02:00 |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
2018-07-12 11:08:24 +02:00 |
|
omar
|
88df66ec83
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
|
2018-07-12 10:03:18 +02:00 |
|
omar
|
23288547ec
|
Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939)
|
2018-07-12 09:53:10 +02:00 |
|
omar
|
9007dff5eb
|
IsItemHovered(): Added ImGuiHoveredFlags_AllowWhenDisabled flag to query hovered status on disabled items. (#1940, #211)
+ shallow changelog tweaks
|
2018-07-10 19:16:57 +02:00 |
|
omar
|
b829671df1
|
Fixed missing value in GetStyleColorName(). (#1939) broken with c7016c2
|
2018-07-10 16:45:54 +02:00 |
|
omar
|
4dfb9ef751
|
Internals: Extracted StartMouseMovingWindow so we can add code to turn an arbitrary widget into a window mover (will be useful to make the Collapse button a window mover past a mouse drag threshold) + added a couple of _None flags.
|
2018-07-10 11:16:40 +02:00 |
|
omar
|
ce18371d1b
|
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
|
2018-07-09 21:49:49 +02:00 |
|
omar
|
dc021f1c23
|
Internals: Fixed CalcSizeContents() returning negative value on first run (inconsequential afaik, but fixing for sanity)
|
2018-07-09 21:38:37 +02:00 |
|
omar
|
9dea27b273
|
Viewport: Made it possible for the moving window to detach and recreate its own Viewport (used by Docking)
|
2018-07-09 21:18:41 +02:00 |
|
omar
|
140ece0aeb
|
Internals: HoveredWindowUnderMovingWindow special handling for drag and drop of window without altering the _NoInputs window flag, which worked but messed up the IsWindowHovered() user-facing flags.
|
2018-07-09 21:18:10 +02:00 |
|
omar
|
7abf72ec78
|
Viewport: Reapply/recover ownership of viewport which is convenient for docking but also can recover from faulty .ini files. (#1542)
|
2018-07-09 21:13:51 +02:00 |
|
omar
|
17f36038e0
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:10:47 +02:00 |
|
omar
|
574185426c
|
Internals: Misc/shallow merge from Docking branch.
|
2018-07-09 21:06:46 +02:00 |
|
omar
|
7033b2043b
|
Internals: Move IMGUI_CDECL declaration to imgui_internal.h so everyone can profit.
|
2018-07-09 20:34:12 +02:00 |
|
omar
|
dd61c4802a
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:22:49 +02:00 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:16:48 +02:00 |
|
omar
|
14cef31467
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-09 16:24:01 +02:00 |
|
omar
|
0708f91617
|
Internals: Removed RootWindowForTabbing, won't be needed. Nav: Not starting NavWindowingTarget when a modal is active (was not noticeable).
|
2018-07-09 16:20:14 +02:00 |
|
omar
|
bd6097ac6f
|
Drag and Drop: Calling BeginTooltip() between a BeginDragSource()/EndDragSource() or BeginDropTarget()/EndDropTarget() uses adjusted tooltip settings matching the one created when calling BeginDragSource() without the ImGuiDragDropFlags_SourceNoPreviewTooltip flag. (#143) + additional safety checks.
|
2018-07-08 20:06:49 +02:00 |
|
omar
|
64938178b7
|
Internals: Moved selectable flags to avoid collision with public flags + rewrote some tests so we can consistently grep for (held && hovered)
|
2018-07-08 18:23:12 +02:00 |
|
omar
|
a33f0d1f7f
|
Drag and Drop: Fixed ImGuiDragDropFlags_SourceNoDisableHover to affect hovering state prior to calling IsItemHovered() + fixed description. (#143)
|
2018-07-08 16:38:57 +02:00 |
|
vby
|
3a42eb6620
|
Fix missing ImmReleaseContext in default Win32 IME handler (#1932)
|
2018-07-08 15:24:12 +02:00 |
|
omar
|
b0cdfe0ece
|
Generalized d11d211e so regular popups (without the AlwaysAutoResize flag) also have a smaller minimum size, but reduced it to an arbitrary 4.0f instead of 1.0f to ease debugging of faulty situations. (#1909)
|
2018-07-08 13:27:16 +02:00 |
|
omar
|
6277781e83
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-07-08 13:08:16 +02:00 |
|
omar
|
c790723cfa
|
Drag and Drop: Fixed an incorrect assert when dropping a source that is submitted after the target (bug introduced with 1.62 changes related to the addition of IsItemDeactivated()). (#1875, #143)
|
2018-07-08 13:03:39 +02:00 |
|
omar
|
d11d211e5d
|
Allow popup from ignoring the style.WindowMinSize values so short menus are not padded. (#1909) Wider generalization of b16603745c.
|
2018-07-06 18:29:39 +02:00 |
|
omar
|
42bf149ac6
|
Removed per-window ImGuiWindowFlags_ResizeFromAnySide beta flag in favor io.OptResizeWindowsFromEdges=true to enable the feature globally. (#1495) The feature is not currently enabled by default because it is not satisfying enough.
|
2018-07-06 15:30:21 +02:00 |
|
omar
|
0146f4b456
|
Internals: BeginChildEx tweaks.
|
2018-07-05 09:17:16 +02:00 |
|
omar
|
7b2662d245
|
Examples: Comments, bits of documentation
|
2018-07-04 19:06:28 +02:00 |
|
omar
|
665bd1e140
|
Links and thanks. Comments on using BeginCombo/EndCombo + moved the Combo() implementations closer to each others to maximize user seeing how it is implemented from any of the secondary function body.
|
2018-07-04 10:29:28 +02:00 |
|
omar
|
770cba0bd0
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
# imgui_internal.h
|
2018-07-02 20:13:16 +02:00 |
|
omar
|
004fe8916a
|
Internals: Settings: Simple optimization caching index into the settings buffer, to remove an unnecessary O(N*M) search during saving. (with N=active root windows during the session, M=stored settings which grows over time)
|
2018-06-28 18:42:38 +02:00 |
|