omar
6881d065b8
DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. ( #648 )
2018-04-30 15:59:59 +02:00
omar
d7e24416dd
DragFloat/SliderFloat internal InputScalar relies on the user supplied format string to format and parse value. ( #648 )
...
The trailing text after the format will be displayed in the InputText but not affect back parsing. Ideally we can try to strip it later.
2018-04-30 15:21:51 +02:00
omar
f2e9dddeca
DragDrop: Removed const qualifier from ImGuiPayload 's void* data, easing casting on user side.
2018-04-28 10:43:15 +02:00
omar
f80314754c
InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. ( #648 )
2018-04-28 00:11:40 +02:00
omar
73445ff248
Renamed all "display_format" arguments to "format" to emphasis that they also affect rounding of values. ( #648 , #642 )
2018-04-27 23:44:27 +02:00
omar
8a38271a7c
SliderFloat, DragFloat: Fix to allow input of scientific notation when Ctrl+Clicking a slider or drag, matching the change done in c19b2781 for InputFloat(). ( #648 , #1011 )
2018-04-27 23:18:28 +02:00
omar
066550de68
DragFloat, DragInt: Cancel mouse tweak when current value is initially past the min/max boundaries and mouse is pushing in the same direction (keyboard/gamepad version already did this).
2018-04-27 19:15:25 +02:00
omar
a84aff1875
Internals: DragBehavior: tweaks internals.
2018-04-27 18:22:10 +02:00
omar
1d99b5f963
Internals: Reordered parameters of DataTypeFormatString() internal helper functions and shallow tweaks.
2018-04-27 18:19:59 +02:00
omar
101f9b42b7
InputText: Fixed returning true when edition is cancelled with Esc and the current buffer matches the initial value.
2018-04-27 17:32:03 +02:00
omar
c47d34cf70
Viewport: Exposing SetNextWindowViewport(). Used in demo and old/obsolete SetNextWindowPosCenter() (which is an interesting case). Fixed back-end likely crash calling GetFocus() after viewport destruction. Fixed metrics crash.
2018-04-27 15:13:22 +02:00
omar
cd51f37fc0
Viewport, Platform: Refresh monitor list (win32, glfw) + avoid calling GetWindowFocus before platform window creation to not require of backend to null-check things inconsistently. ( #1542 )
2018-04-26 16:18:47 +02:00
omar
da70c837da
Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. ( #1542 )
2018-04-26 15:30:19 +02:00
omar
f1ae07e532
Viewport, Platform: Using Platform_GetWindowFocus to provide a much stronger heuristic of platform z-order, in replacement for when the back-end cannot provide io.MouseHoveredViewport. The pressure for it to work well increased with the use of viewports by popups/menus. ( #1542 )
2018-04-26 11:52:38 +02:00
Bruce Mitchener
f8c9c33d33
Fixed static analyzers warnings with bool literals ( #1775 )
...
* Use `false` instead of `0` for a bool literal.
* Simplify calls to RadioButton to not need bool literals.
2018-04-26 09:51:46 +02:00
omar
d9cd494eaf
Viewport: Moved ScaleWindow* code in a proper location. Various comments.
2018-04-25 23:21:26 +02:00
omar
eb1c36fdfb
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. ( #1695 , #1769 )
2018-04-25 22:07:14 +02:00
omar
5979233a3c
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
2018-04-25 18:23:39 +02:00
omar
0b1d6a0d52
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2018-04-25 18:13:23 +02:00
omar
711a63befc
Misc: Stop moving window if mouse position becomes invalid. Flagged menus are _NoMove for sanity.
2018-04-25 17:58:54 +02:00
omar
d317d90610
Misc: NavCalcPreferredRefPos selects between mouse and nav reference position + added sanity assert (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:54 +02:00
omar
9cbca8c127
Begin: Shuffled some code, _should_ have no side-effect. Clear NextWindowData in one call and more consistently. (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:54 +02:00
omar
e3453d0dc4
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
2018-04-25 17:58:53 +02:00
Bruce Mitchener
b28535d1da
ImGuiTextBuffer::appendfv needs to va_end the args_copy.
2018-04-25 17:40:39 +02:00
omar
7b433605f9
Viewport: Avoid creating viewport on drag (fix cc882b0723)
2018-04-25 15:38:32 +02:00
omar
3b9b1956cd
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/imgui_impl_a5.cpp
# examples/allegro5_example/imgui_impl_a5.h
# examples/allegro5_example/imgui_impl_allegro5.cpp
# examples/allegro5_example/imgui_impl_allegro5.h
# examples/allegro5_example/main.cpp
# examples/imgui_impl_allegro5.cpp
# examples/imgui_impl_allegro5.h
# imgui.cpp
# imgui_internal.h
2018-04-25 15:32:04 +02:00
omar
01fa934222
Internals: Removed unecessary Pos/PosFloat separation, only reason appears to be mostly pre-1.0. The only piece of code that I expected sub-pixel window position to matter actually already round its delta (wrongly so, will fix later/separately if we want).
2018-04-25 15:24:26 +02:00
omar
cc882b0723
Viewport: Tidying up AddUpdateViewport() calls. Moved flags argument. Removed extraneous mid-frame call to FindPlatformMonitorFromRect(). ( #1542 )
2018-04-25 15:14:51 +02:00
omar
6d6580f6be
Viewport: Fixed glitches with newly appearing menus creating viewport while the underlying imgui window should be hidden. ( #1542 )
2018-04-25 11:23:58 +02:00
omar
7684f53328
Viewport: Fixed issues with popups drifting in particular when reference mouse position become invalid (e.g. changing app focus while viewported-menu is open). Storing monitor index in viewport at beginning of the frame. ( #1542 )
2018-04-25 11:23:58 +02:00
Bruce Mitchener
7ebdadf92b
Fix various typos.
2018-04-25 09:40:14 +02:00
omar
e3e4b7bdf5
Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. ( #1542 )
...
Platform: Clarifying some comments in back-ends.
2018-04-24 17:10:27 +02:00
omar
679f4882a5
Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)
2018-04-24 17:10:26 +02:00
omar
46698c96c5
Removed presumably obsolete MovingWindow tests which prevent move/merge logic in viewport branch from working in all situations (e.g. docking away when ActiveId is the ID of a tab)
2018-04-24 16:48:26 +02:00
omar
dc03c93164
Internals: Removed misleading ImRect::FixInverted + fix minor formatting in Readme.
...
Demo: Fixed Overlay: Added a context menu item to enable freely moving the window.
2018-04-24 14:19:10 +02:00
omar
cb78e62df9
Viewport, Platform: Fixed IME positioning for multi-viewport. Moved API from ImGuiIO to ImGuiPlatformIO. Because it is extremely unlikely to people redefined this API manually the moving-forward-breakage is ok. ( #1542 )
...
SDL2 ime support under Win32 never worked properly because of SDL interferences.
2018-04-24 12:40:38 +02:00
omar
376f2aec54
Viewport: Clamp windows within monitors + fallback rescue window when it is out of sight (e.g. removed monitor, changed resolution) + Win32: declare primary monitor at the beginning of the list. ( #1542 )
2018-04-23 23:01:37 +02:00
omar
010757266e
Viewports: Todos, Tooltips/menus not automatically forced into their own viewport when the NoMerge flag is set (however the multiplication of viewports makes them more likely to protude and create their own). Win32: try to make primary monitor the first tin the list. ( #1542 )
2018-04-23 23:00:14 +02:00
omar
d268471285
Viewport: Added ImGuiConfigFlags_ViewportsNoMerge flag (to enforce a platform window for all floating windows) + minor tidying up and addition of non-functional wip code.
2018-04-23 18:56:25 +02:00
omar
7b6b7038c5
Window: Relaxed the internal stack size checker to allow Push/Begin/Pop/.../End patterns to be used with PushStyleColor, PushStyleVar, PushFont without causing a false positive assert. ( #1767 )
2018-04-23 17:58:49 +02:00
omar
f1c31ebc67
Viewport: Fixed initial popup positioning not using the monitor area properly. ( #1542 )
2018-04-23 12:52:01 +02:00
omar
4433ce4312
Viewport, Platform: Added work area in ImGuiPlatformMonitor. Renamed fields. ( #1542 )
2018-04-23 12:38:20 +02:00
omar
22773e03a2
InputText: On Mac OS X, support Cmd+Shift+Z for Redo. Cmd+Y is also supported as major apps seems to default to support both. ( #1765 )
2018-04-23 11:15:13 +02:00
omar
e2f831c80e
InputText: tweaks, minor refactoring, renaming + comments ( #1695 )
2018-04-23 11:09:16 +02:00
omar
456bbffcc4
Viewport: Switched to using unified platform-absolute mouse coordinates, which simplify lots of problems and simplify/reduce tricky conversions, makes ImVec2 less ambiguous. Fixed various viewport/windowing/popups/synchronization bugs. Settings on host-viewport are stored as relative (made settings decently compatible between viewport enable/disabled settings). Merged ImGuiViewport::Pos and ::PlatformPos. Tweaked thumbnails. Better, smaller code. ( #1542 )
2018-04-20 21:36:36 +02:00
omar
037d5a7e98
Columns: Fixed a bug introduced in 1.51 where columns would affect the contents size of their container, often creating feedback loops when ImGuiWindowFlags_AlwaysAutoResize was used. ( #1760 )
2018-04-20 16:03:21 +02:00
omar
49a451d247
Window: Fixed windows using the ImGuiWindowFlags_NoSavedSettings flag from not using the same default position as other windows. ( #1760 )
2018-04-20 15:40:12 +02:00
omar
f93dce9513
InputText: Tweak to make the if statement more readable + update Changelog ( #1747 )
2018-04-19 16:21:32 +02:00
Mikko Sivulainen
1554d97492
on OSX, ignore text input when CMD key is down
2018-04-19 16:17:57 +02:00
omar
637d9c42bf
Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. ( #1542 )
2018-04-19 13:12:02 +02:00
omar
f5700f238d
Documentations for Github users. Metrics: Fixed display of NavRectRel, added display of ParentWindow.
2018-04-19 11:08:20 +02:00
omar
1c385c2ca4
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui_internal.h
2018-04-18 19:06:49 +02:00
omar
6d6f4a85f6
Fixed DisplaySafeAreaPadding not affecting popups/tooltips/menus at it should have (partly broken in 2e5577f44f).
2018-04-18 17:40:38 +02:00
omar
6a0b2627ad
BeginMainMenuBar: Followup to 1e41bad9. Removed public window flag. DisplaySafeAreaPadding defaults to (3,3) instead of (4.4). Comments, tab to spaces, Changelog. ( #1439 )
2018-04-18 17:37:35 +02:00
Doug Binks
1e41bad90f
Added DisplaySafeAreaPadding to MainMenuBar height and fixed starting x position. Fixes main menu bar problems with TVs. ( #1439 )
2018-04-18 15:13:09 +02:00
omar
7241dc61d4
Fixed default proportional item width lagging by one frame on resize + miscellaneous minor tweaks.
2018-04-17 23:36:59 +02:00
omar
25f25d546d
Viewport: Fixed manual mouse resize to handle mouse viewport change, which will allow resizing a window while it changes viewport. Releasing manual resize may merge a window. Added ConvertViewportPosToViewportPos() helper. Renamed NewFrameUpdateMovingWindowDropViewport() to UpdateTryMergeWindowIntoHostViewport() and removed the now-unnecessary half of the function. + renaming ( #1542 )
2018-04-17 23:34:19 +02:00
omar
6ac50634e3
Viewport: Tweaked selection of g.MouseRefViewport, in particular aimed at fixing browsing child-menus while holding mouse buttons with menus in multiple viewports. ( #1542 )
2018-04-17 18:25:05 +02:00
omar
50e453a3e2
Viewport: Comments, tweaks, renaming. Removed unnecessary stuff. Fixed zealous Clang warning. ( #1542 )
2018-04-17 18:25:05 +02:00
omar
4649bf042e
Viewport: Render: Fix draw list build code to allow child windows to be in a different viewports (which will happen with e.g. extruding menus). ( #1542 )
2018-04-16 17:12:00 +02:00
omar
2bd0ee27f0
Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. ( #1542 )
2018-04-16 17:12:00 +02:00
omar
0d16492eb7
Viewport: Moved ImGuiWindowFlags_FullViewport to an internal ViewportOwned flag. Renamed AddViewport to AddUpdateViewport. (#Viewport: Shuffled code in Begin to reset size of reappearing popups prior to selecting viewport, to avoid mistakenly using an old size. Moved code out of UpdateSelectWindowViewport() to the section of Begin where positions is being locked down, to avoid code in-between duplicating this. ( #1542 ))
2018-04-16 17:11:59 +02:00
omar
2ae19801a9
Viewport: Remove old code that never worked (testing wrong flag type, always false) + shuffled a few things in Begin() to clarify dependencies. Fixed viewport change on Begin/Begin/End/End patterns. ( #1542 )
2018-04-16 17:11:59 +02:00
daniel-murray
83d97d4a9b
Fix typos KeyDown => KeysDown
2018-04-14 10:28:10 +02:00
omar
d1c16d4ccd
Documentation bits. Misc comments.
2018-04-13 22:23:34 +02:00
omar
950539b768
Viewport, Platform, DPI: Back-end store per-monitor DPI information in ImGuiPlatformMonitor. ( #1542 , #1676 )
2018-04-13 20:26:36 +02:00
omar
f270d6c52c
Viewport: Fix to allow changing/animated window name to be reflected in the OS e.g. task bar, so named documents can appear properly. ( #1542 )
2018-04-13 16:21:34 +02:00
omar
22d6f00110
Viewport: Fixed DPI changing viewport from interfering with moving another window (disabling code) + metrics crash fix on closed viewport window + Windows 10 call to SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2) for DPI, with no noticeable improvements. ( #1542 , #1676 )
2018-04-13 11:14:06 +02:00
omar
38e357ef10
Viewport: Virtual mouse position are patched immediately when viewports are moved in the virtual space, avoiding interaction glitchs on a resizing frame. ( #1542 )
2018-04-12 19:57:35 +02:00
omar
0b7f3edc26
Viewport: Debug/metrics tweaks + renaming comments
2018-04-12 19:57:34 +02:00
Guillaume Chereau
58fd8ea303
Fix minor error in doc
...
Not a big deal.
2018-04-12 13:18:26 +02:00
omar
285269ef55
Viewport, Platform: Added ImGuiViewportFlags_TopMost that will be used by tooltip window (without it, clicking and holding the window emitting the tooltip would move the tooltip to the back) + GLFW backend fixes for non-win32 platforms. ( #1542 )
2018-04-11 21:27:19 +02:00
omar
e25da4230b
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-04-11 21:25:44 +02:00
omar
8be6f40ae1
Viewport: per-viewport overlay draw list created on demand. With this pattern it'll be easier to consider adding more (e.g. background draw list). ( #545 )
2018-04-11 21:21:52 +02:00
omar
d1d2bbf86a
Internals: Popup: Moved popup/menu/tooltip positioning code (viewport branch needs it organized in a different manner, so we are pushing the bulk of it here to minimize differences).
2018-04-11 17:01:19 +02:00
omar
bfc0efaae9
Internals: Window: Aggregating ImDrawList into the ImGuiWindow structure.
2018-04-11 12:43:38 +02:00
omar
84fe711bdf
Settings: Fixed saving an empty .ini file if CreateContext/DestroyContext are called without a single call to NewFrame(). ( #1741 )
2018-04-11 10:08:23 +02:00
omar
296f03374b
NewFrame: Prevent division by zero in frame rate calculation if io.DeltaTime is continuously zero. ( #1740 , #881 )
2018-04-10 23:48:27 +02:00
omar
83bd3595a4
Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. ( #1542 )
2018-04-10 22:58:39 +02:00
omar
32ee0a3947
Viewport, Platform: Added a way to register monitor bounds to imgui so they can be used to clamp individual-viewport tooltips/popups so they don't straddle monitors. ( #1542 )
2018-04-10 22:32:08 +02:00
omar
7ddc22b326
Viewports, DPI: Renamed config flags. ( #1542 )
2018-04-10 20:02:43 +02:00
omar
0d5042f0f3
Viewport: Popups, Tooltips can individually request no task bar icons to the platform layer. ( #1542 )
2018-04-10 19:15:44 +02:00
omar
0eaddb4dcd
Viewport: shuffled some code in the UpdateSelectWindowViewport() function.
2018-04-10 18:47:23 +02:00
omar
928a4ad315
Begin: moved tooltip position code in an else block. Misc comments
2018-04-10 16:51:16 +02:00
omar
52cac135c9
Internals: Renamed GetFrontMostModalRootWindow() to GetFrontMostPopupModal() and exposed in imgui_internal.h ( #1738 )
2018-04-10 15:04:36 +02:00
omar
d4dd448511
Examples, Platform, Viewport: Fixed inconsistent window ownership issues. Added comments. Made Win32/SDL back-ends track ownership.
2018-04-09 22:01:58 +02:00
omar
9117632bf0
Misc: IM_DELETE() helper function added in 1.60 doesn't clear the input _pointer_ reference, more consistent with expectation and allows passing r-value.
2018-04-09 20:42:49 +02:00
omar
56ad2a2d74
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/vulkan_example/main.cpp
# imgui.h
2018-04-09 19:35:14 +02:00
omar
6f1f5cbc20
Version 1.61 WIP
2018-04-09 14:02:32 +02:00
omar
3a29ddbcfa
Version 1.60
2018-04-08 00:45:02 +02:00
omar
6d0c720451
Internals: Removed unused internal variant of ArrowButton().
2018-04-07 23:06:06 +02:00
omar
82b7a39f31
Fixed a few zealous warnings.
2018-04-07 10:38:01 +02:00
omar
c712f7275d
Fixed unused variable warning.
2018-04-07 10:25:51 +02:00
omar
f421e73b40
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
2018-04-06 23:36:23 +02:00
omar
c2fc978983
Style: Default style is now StyleColorsDark()! Toward a 1.60 release :) ( #707 )
2018-04-06 23:25:25 +02:00
omar
0734a12d25
IO: ImGuiConfigFlags_NoMouse disable hovering so it is not destructive. Amend 2464e62a1a
2018-04-06 23:05:53 +02:00
omar
e88fb10d7c
NewFrame: Extract some code into a NewFrameUpdateHoveredWindowAndCaptureFlags() which can be of use with touch-based inputs systems.
2018-04-06 19:36:15 +02:00
omar
c1bdab6d5b
Comments about io.WantCapture flags + todo entries.
2018-04-06 19:36:14 +02:00
omar
ac2027c415
NewFrame: Extract some code into a NewFrameUpdateMouseInputs function. Moved settings saving higher up in the function so it is next to its peers.
2018-04-06 19:36:14 +02:00
omar
2464e62a1a
IO: Added ImGuiConfigFlags_NoMouse to force clear/disable mouse inputs in NewFrame().
2018-04-06 19:36:13 +02:00
omar
18a243bef0
Columns: Fixed calling Columns() again with the same number of columns. ( #125 )
2018-04-06 17:50:50 +02:00
omar
72899318e6
Viewport, Platform, Examples: Added support for transparent window via PlatformIO Platform_SetWindowAlpha ( #1542 ) + fixes for GLFW 3.3
2018-04-05 17:07:46 +02:00
omar
c23b5463c7
Viewport: Moving a window accross viewports tries to preserve the dragging pivot (that is assuming that the window will be evenly scaled by DPI, aka Style is scaled). ( #1542 )
2018-04-05 11:40:33 +02:00
omar
9d8bc79025
Viewport: Renamed RenderPlatformWindows() to RenderPlatformWindowsDefault(), tweaked examples and emphasis optional Viewport code path. ( #1542 )
2018-04-05 11:06:00 +02:00
omar
0cad274b87
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.h
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
2018-04-04 19:39:42 +02:00
omar
fc30462f18
Hide new windows for one frame until they calculate their size. Also fixes SetNextWindowPos() given a non-zero pivot. ( #1694 )
2018-04-04 19:35:08 +02:00
omar
5aa3f99b4c
Internal: using more consistent comparaison with HiddenFrames to not imply it could be -1. Tweaked comments.
2018-04-04 17:21:36 +02:00
omar
4649967112
Added extra comments and assertions to avoid user combining ImGuiCond flags. ( #1694 )
2018-04-04 15:01:01 +02:00
omar
cd1e6e384f
Tooltip windows uses PopupBorderSize ( #1697 ) + commented out debug stuff.
2018-04-04 12:39:48 +02:00
omar
1e116e6c17
Removed need for -Wnocast-qual on modern Clang/Xcode as a token of good behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik.
2018-04-03 23:18:43 +02:00
omar
84fbc49403
BeginChild: named child don't include the full id inside their name ( #1698 )
2018-04-03 22:13:35 +02:00
omar
78610a54d2
Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.
2018-04-03 20:55:30 +02:00
omar
77e234d9df
Comments
2018-04-03 20:22:44 +02:00
omar
c461401b21
Comments, FAQ
2018-04-03 20:05:59 +02:00
omar
cc96477b1c
Comments ( #1695 )
2018-03-25 14:45:40 +02:00
omar
ac8931b2e9
Viewport: Moved OverlayDrawList to be a per-viewport instead of being global + fix overlay clipping glitch during viewport creation frame + support for software mouse cursor stradding over multiple viewport. The overlay draw list move is rather important as draw lists are not shared among viewports anymore and we can do a swap of their data without copying it. ( #1542 )
2018-03-22 22:09:42 +01:00
omar
4f112f898e
Viewport: Avoid modifying MousePos in UpdateWindowViewport just for the sake of docking test, sheering MousePos during the frame is problematic + minor renaming. ( #1542 )
2018-03-22 21:14:55 +01:00
omar
b69dc45f6e
Internals: Removed ImGuiDataType_Float2.
2018-03-22 20:14:31 +01:00
omar
c19b27813d
Added InputDouble() function. We use a format string instead of a decimal_precision parameter to also for "%e" and variants. ( #1011 ) May transition the other InputXXX function to use format strings as well.
2018-03-22 18:58:40 +01:00
omar
c796960ff9
InputFloat: Scientific input. InputText: Added ImGuiInputTextFlags_CharsScientific to add 'e' 'E' to list of characters that can be input. (later useful for #1011 )
2018-03-22 17:49:53 +01:00
omar
21ac470a8a
Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.
2018-03-22 16:37:21 +01:00
omar
e5ba982be0
Nav: Fixed a crash with IMGUI_DEBUG_NAV_SCORING enabled + added info to Metrics.
2018-03-21 22:48:23 +01:00
omar
42ad3c1dd3
Examples: OpenGL2: Added multi-viewport support in the OpenGL2 back-end. ( #1542 ) + Metrics: Fix undisplayed flag.
2018-03-20 22:19:41 +01:00
omar
172570acae
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
# imgui.h
2018-03-20 22:14:34 +01:00
omar
75c3793db5
IO: Added ImGuiConfigFlags_NoSetMouseCursors. Added ImGuiBackendFlags_HasMouseCursors, ImGuiBackendFlags_HasSetMousePos. ( #787 , #1495 , #1202 )
2018-03-20 21:19:23 +01:00
omar
dcf7c3d188
Added ImGuiBackendFlags for backend to expose its capabilities. Added ImGuiBackendFlags_HasGamepad. ( #787 , #1542 )
2018-03-20 20:39:44 +01:00
omar
170f44e6f0
IO: Renamed io.WantMoveMouse to io.WantSetMousePos (was added in 1.52, _not_ used by core and only honored by some binding ahead of merging the Nav branch) + internal renaming ( #787 )
2018-03-20 20:12:34 +01:00
omar
c29971cf72
Merge branch 'master' into viewport
...
# Conflicts:
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
2018-03-20 16:05:31 +01:00
omar
ccc9a22db3
Viewport: Changelog + Internals: Renamed viewport mouse fields for consistency (going to add more). ( #1542 )
2018-03-19 22:59:55 +01:00
omar
d1c45db9e8
Fixed enum typo.
2018-03-19 22:47:10 +01:00
omar
c00523dba4
Viewport: Added extra Metrics and debug features.
2018-03-19 18:07:12 +01:00
omar
9d5ec05150
Viewport, Platform: Update the contents of GetPlatformData() in EndFrame() so back-end can access it even if UpdatePlatformWindows hasn't been called. ( #1542 )
2018-03-19 17:33:21 +01:00
omar
2fecd332fc
Viewport, Platform: Added void* to render/swap buffer functions. Comments. ( #1542 , #1042 )
2018-03-19 15:20:47 +01:00
omar
62e94717eb
Nav: InputText: Allow editing text input fields with NavActivate (space). Not sure about that, on one hand it feels more consistent but you can't finish the editing with space to double space (activate + input space) could feel inconsistent. ( #787 )
2018-03-19 13:20:25 +01:00
omar
33ad8b2f0c
Nav: Track nav input source more generally (gamepad vs keyboard) ( #787 ) + update todos and demo tweaks
2018-03-19 13:20:18 +01:00
omar
46b61427e1
Viewport, Platform: Refactored platform interface. Removed need to use imgui_internal.h in backends. Split viewport into public facing ImGuiViewport and internal structure. Exposing enough data to provide custom tweaked renderers. Renamed handlers, fixed lots of inconsistencies. ( #1542 , #1042 )
2018-03-18 18:44:57 +01:00
omar
1ab236d9df
Viewport, Platform: Internal renaming to use more consistent (OsDesktopPos > PlatformPos). ( #1542 )
2018-03-15 20:07:48 +01:00
omar
8364d1ca6c
Viewport: Removed back-end renderer code that implied we need to clear with WindowBg color. Added NoRendererClear flag. ( #1542 , #1042 )
2018-03-15 18:17:04 +01:00
omar
6e58a95a01
Viewport, Platform, Examples: Changes to resizing flow + restored support for Platform events affecting the ImGui windows (so Decorated windows are functional). ( #1542 , #1042 ) ..
...
SDL: Added platform move/resize/close support.
GLFW: Added platform move/resize support. Moved Close to use callback for consistency.
Win32:
Vulkan: Fixed resize support.
Naming is WIP "PlatforrmRequestXXX" is too ambiguous. Basically we either have a ImGui->Platform flow or a Platform->ImGui flow. Working a bigger refactor now.
2018-03-15 10:57:22 +01:00
omar
207ad45983
Metrics: Displaying all draw lists of a window (if it uses layer 0 and has already been appended to earlier in the frame).
2018-03-14 17:50:11 +01:00
omar
921bb92eec
Viewport: Fixed software mouse cursor from appearing in all multiple lists simultaneously. ( #1542 )
2018-03-13 16:20:34 +01:00
omar
c50198debe
Viewport: Obsoleted io.DisplayPos (which was a Viewport branch thing), added ImDrawData::DisplayPos, DisplaySize ( #1542 ) wip
2018-03-13 16:20:27 +01:00
omar
6371474031
Viewport: Removed unnecessary function hoop.
2018-03-13 16:20:19 +01:00
omar
f6fc28dfd2
Merge branch 'master' into viewport (inc Vulkan resize fix merge #1042 )
2018-03-12 17:50:32 +01:00
omar
e7670c0bcc
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. ( #707 )
2018-03-12 11:48:04 +01:00
omar
b9ac127b0b
Internals: Columns renaming fields
2018-03-12 11:03:27 +01:00
omar
5e63711084
Viewport, DPI: Some early work on per-viewport DPI support. At the moment the easiest way is to replace fonts during the ChangedViewport callback, but down the line we should aim at handling some of it at ImFont level. ( #1542 , #1676 )
2018-03-12 10:31:39 +01:00
omar
a2fbcc9ad4
Examples: DPI: Portable DPI related helpers in the _Win32 examples. Using one in examples's main.cpp, the GetDpiScale functions are not wired anywhere for now. ( #1542 , #1676 )
2018-03-12 10:31:39 +01:00
omar
10030ff3ec
Viewport: Fix dropping back viewport not being moved to the front of the window list. (Now that viewport are more tighly coupled to a single root window) ( #1542 )
2018-03-12 10:31:38 +01:00
omar
648735a4cf
Viewport, DPI: Don't activate current window until a viewport has been selected. At this point we'll have the proper size/scale for the current DPI + fix viewport callback when appending to an existing window more than once a frame. ( #1542 , #1676 )
2018-03-12 10:31:38 +01:00
omar
a4629b0b36
Viewport, DPI: Select viewport before locking style sizes and before handling double-click-on-title-bar to collapse. ( #1542 , #1676 )
2018-03-12 10:31:38 +01:00
omar
64cbbed152
Merge branch 'master' into viewport
2018-03-09 10:41:12 +01:00
omar
43f375b2f2
Viewport,Platform: Added GetWindowDpiScale() platform interface, changes of scale are reflected by positioning and resizing windows in their given viewport. ( #1542 )
2018-03-09 10:40:38 +01:00
omar
351b3fa7b0
Updated Changelog following merge of #1619 + fixed entry added to wrong version Changelog in 1ef1acbd8d
2018-03-09 10:29:41 +01:00
omar
4d46383100
Viewport: Coupling non-main viewport to one window. Viewport name derived from the window. Added ImGuiConfigFlags_PlatformNoTaskBar, off by default (aka re-established task-bars by default for now). ( #1542 )
2018-03-08 20:27:01 +01:00
omar
a3d5f92214
Merge branch 'master' into font_offset
2018-03-08 16:49:39 +01:00
omar
642c6748ac
Comments, Changelog
2018-03-08 11:15:27 +01:00
omar
9ea16e344a
Viewport: Disable extra viewports from hosting other windows. ( #1542 )
2018-03-07 16:34:18 +01:00
omar
d8719cf59b
Fixed warnings.
2018-03-07 14:46:53 +01:00
omar
9dcc07422e
Viewport: Reorganized viewport enable flags. Both user + platform + renderer need to enable a flag. ( #1542 )
2018-03-07 12:35:26 +01:00
omar
21ff03978a
Viewport: Modal display their darkneing/whitening layer over all viewports. ( #1542 )
2018-03-07 11:36:37 +01:00
omar
25fd9d6132
Viewport: Various sanity fixes. Popup always inherit viewport from their parent for now. ( #1542 )
2018-03-07 10:50:30 +01:00
omar
3637193556
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_glfw.h
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# imgui.cpp
2018-03-06 20:02:40 +01:00
omar
cea7492bab
Render: Removed the code that disable render if style.Alpha is 0.0f, it is both incorrect (as style Alpha can be modified mid-frame), not really necessary (just tested that full Alpha = 0 will lead to empty draw lists!) and misleading (bulk of the work was already done).
2018-03-05 22:47:53 +01:00
omar
8e3274e137
Viewport: Tracking current viewport we are appending to + added callback in PlatformInterface for DPI purpose (WIP). ( #1542 )
2018-03-05 22:31:12 +01:00
omar
51afaf7117
Fixed type cast warning.
2018-03-05 13:15:15 +01:00
omar
0ec356eb6e
Comments, FAQ update.
2018-03-05 13:05:47 +01:00
omar
5ed45d0aec
Columns: Fixed destructive small resize. ( #1656 ). The OffsetNorm clamp introduced by #913 was ok as it didn't write back into the storage, which #1499 started doing making it destructive. Right now I don't think the clamp is needed at all. It had uses (eg: hide the issue fixed by bf7481eba0).
2018-03-04 17:55:59 +01:00
omar
bf7481eba0
Columns: Extent stop at the right-most clipped pixel. The right-most column might appear a little wider but it's usable space matches the others. ( #125 ). +9 Internal: Store InnerClipRect.
2018-03-04 17:44:17 +01:00
omar
968a8d2a3f
Columns: Clamping MaxX above MinX. This shouldn't have much of a benefit / affect, but the internal values are more sane this way. ( #125 )
2018-03-04 16:58:24 +01:00
omar
ee770af72c
Columns: Adding per-window display in Metrics. Tidying up, removing old code/comments. ( #125 , #1499 , #1656 )
2018-03-04 16:56:21 +01:00
omar
c4a158656e
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/directx9_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_vulkan.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
2018-03-03 23:13:31 +01:00
omar
e026c8d3b7
Viewport: Give a chance to platform and renderer to actually destroy their data. Otherwise the regular ImplXXX_Shutdown + following by DestroyContext() order fails to fullifl this. ( #1542 )
2018-03-03 22:53:31 +01:00
omar
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
2018-03-03 20:15:10 +01:00
omar
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
2018-03-03 20:08:03 +01:00
omar
1549c5cf5e
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
2018-03-03 19:43:31 +01:00
omar
ad7ff7504e
Merge branch 'patch-1' of https://github.com/stfx/imgui into stfx-patch-1
2018-03-03 19:34:47 +01:00
omar
839cdd37a3
Combo: Arrow button isn't displayed over frame color, so color is consistent with other button + the button doesn't have inner rounding.
2018-03-03 19:23:48 +01:00
omar
11f13ab24f
Internal: renamed RenderTriangle() to RenderArrow().
2018-03-03 19:08:22 +01:00
omar
e9fa17e1bf
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). ( #1542 )
2018-03-02 22:44:06 +01:00
omar
b807347e94
Viewport: When enabled we assert against using RenderDrawListFn to make user more aware of rendering order. ( #1542 )
2018-03-02 22:22:14 +01:00
omar
00b9e70ba2
Viewport: Always be lenient with invalid mouse position during dragging, since they are provided by back-end and technically acceptable inputs + comments. ( #1542 )
2018-03-01 20:19:36 +01:00
omar
6797ee4b68
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. ( #787 )
2018-03-01 13:03:12 +01:00
omar
c994796e26
Internal: Moved IM_NEWLINE helper to imgui_internal.h
2018-02-28 21:45:02 +01:00
omar
d98a5d54aa
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
2018-02-28 19:03:39 +01:00
omar
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
2018-02-28 18:51:40 +01:00
omar
735267d27c
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) ( #1542 )
2018-02-27 23:25:39 +01:00
omar
b5ced477f4
Metrics: Added option to show begin order, useful for debugging.
2018-02-27 23:02:50 +01:00
omar
67319a71e5
Internal: Minor renaming.
2018-02-27 22:58:27 +01:00
omar
184a6f1198
Internals: Moving window: test mouse validity while translating window + using SetWindowPos().
2018-02-27 22:56:22 +01:00
omar
b32bb4e6e3
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
2018-02-27 22:55:18 +01:00
omar
0e62b7d68a
Clearing next window data at the end of Begin() more reliably. Misc comments.
2018-02-27 22:47:45 +01:00
omar
a761779b12
Internals: Settings: Added ReadCloseFn to allow handlers to sanitize data on a per-entry basis.
2018-02-27 22:32:45 +01:00
omar
3f335b0d42
Merge branch 'master' into examples_refactor
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
2018-02-26 18:22:36 +01:00
omar
c7835dd189
ImRect: Removed misleading IsFinite() function used by some Nav code.
2018-02-26 16:35:46 +01:00
omar
5427eca960
Compacted some old Breaking Changes notes (Pre July 2015 stuff)
2018-02-25 19:05:31 +01:00
omar
bd267ad739
Changelog: Added all change infos since 1.53 up to the current version.
2018-02-25 14:15:38 +01:00
omar
27667fc035
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. ( #1079 )
2018-02-25 14:15:37 +01:00
omar
e6bc840f6f
Merge branch 'master' into examples_refactor
2018-02-23 10:47:32 +01:00
omar
8040cf1425
Merge branch 'master' of https://github.com/podgorskiy/imgui into podgorskiy-master
2018-02-22 23:22:16 +01:00
Podgorskiy
94466745bb
A tiny optimization to ImLineClosestPoint. Removed unnecessary sqrtf call.
...
ab_lenSqr -> ab_len_sqr
Moved line where ab_len_sqr is computed after the first return
2018-02-22 10:57:20 -05:00
omar
b28995b667
Nav: Internals: Exposed NavMoveRequestCancel in imgui_internal.h ( #1640 )
2018-02-22 15:39:49 +01:00
omar
91cadc1130
Merge branch 'master' into examples_refactor
2018-02-21 22:47:03 +01:00
omar
2c3c5125b3
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. ( #143 , #1637 )
2018-02-21 21:33:58 +01:00
omar
bcdfd5d61c
Merge branch 'master' into examples_refactor
2018-02-20 16:18:02 +01:00
omar
7cbcccd96b
Update Breaking Change section with moved misc/fonts/ ( #1631 )
2018-02-20 12:08:37 +01:00
omar
7ee2bc8f5e
FAQ about backslashes in string literal since the one in main.cpp isn't being noticed enough. ( #1397 )
2018-02-20 10:24:31 +01:00
omar
b33f0e215f
Initialization happens during CreateContext(), which makes it easier for platform layers to interact with the context during their initialization.
2018-02-18 23:28:56 +01:00
omar
45cbebad64
Added dummy io.DisplayPos field.
2018-02-18 21:04:17 +01:00
omar
1399c9c8a9
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
2018-02-18 20:21:21 +01:00
omar
bdb27366e7
Nav: Tweak windowing highlighting for full viewport windows.
2018-02-17 00:19:04 +01:00
omar
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
2018-02-16 19:18:16 +01:00
omar
20c14f9589
Fixed GCC zealous warnings ( #1623 )
2018-02-16 15:43:28 +01:00
omar
1cbfe0700c
Plot: plot a flat line if scale_min==scale_max ( #1621 )
2018-02-16 14:34:49 +01:00
omar
30c469f7c5
ImFont: DisplayOffset.y defaults to 0 instead of +1.
2018-02-15 10:46:28 +01:00
omar
eb1d481915
Comments ( #1230 , #1611 )
2018-02-12 15:38:04 +01:00
omar
d8d1da27fd
Merge branch 'master' of https://github.com/RandyGaul/imgui into RandyGaul-master
2018-02-12 15:35:16 +01:00
Randy Gaul
2c4a761982
__cdecl markup for non-standard calling conventions via MSVC
2018-02-12 00:50:40 -08:00
omar
64e0666803
Internals: Moved some of NewFrame() into UpdateMovingWindow().
2018-02-11 22:48:30 +01:00
omar
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
2018-02-10 16:50:19 +01:00
omar
3b163ac35b
Internals: Clarified internal storage for RootWindow with specific semantic (the Docking branch will need to introduce finer differenciation there.)
2018-02-08 23:11:51 +01:00
omar
d17d21da1b
Warning fix. ( #1565 )
2018-02-06 20:21:29 +01:00
omar
7c16d52f72
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch ( #1565 , #787 )
2018-02-06 20:20:34 +01:00
omar
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
2018-02-06 20:16:03 +01:00
omar
4e5b7612ae
Nav: Documentation tweaks. ( #787 )
2018-02-06 20:10:05 +01:00
omar
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
2018-02-06 19:54:30 +01:00
omar
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
2018-02-06 19:23:12 +01:00
omar
ed4bbc4fd4
Nav: Comments, guides.
2018-02-06 18:48:31 +01:00
omar
cea8017e0b
Merge branch 'master' into context
2018-02-06 18:04:44 +01:00
omar
db071184a0
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-02-06 13:51:09 +01:00
omar
b50dce54ea
Drag and Drop: TreeNode as drop target displays rectangle over full frame. Added optional internal storage for item display rect. Will expose later. ( #1597 , #143 )
2018-02-06 13:46:14 +01:00
omar
c6ba7c8231
Internals: TreeNode: Renaming local to be more consistent with other widgets.
2018-02-06 13:41:46 +01:00
omar
e6926d9f7c
Internals: Refactored bool LastItemRectHovered into flags. ( #1597 )
2018-02-06 13:34:41 +01:00
omar
ce2b8d3255
Nav: Comments, removed extraneous parameter.
2018-02-06 13:16:44 +01:00
omar
0c0d811859
Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. ( #787 )
2018-02-05 23:53:40 +01:00
omar
fb9fecea5e
Nav: Sliders and Drags are toggle activated instead of requiring user to cross Cross/Space. ( #787 )
2018-02-05 20:16:38 +01:00
omar
4932303e62
Nav: DragBehavior: Tweaks (to take the noise out of the next commit).
2018-02-05 20:15:31 +01:00
omar
e5e3cc617e
Nav: Maintaining a NavActivatePressedId field that widget can conveniently use along with NavActivateDownId.
2018-02-05 19:37:29 +01:00
omar
fb7cf4a475
Nav: Removed old unnecessary ifdefs.
2018-02-05 18:25:03 +01:00
omar
f35734c925
Nav: Debugging code. ( #787 )
2018-02-05 17:02:30 +01:00
omar
92ee6b1185
Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. ( #787 )
2018-02-05 16:07:54 +01:00
omar
348c46d21e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-05 15:50:28 +01:00
omar
11d0fc8220
Tooltip: BeginTooltip() sets NoInputs flag.
2018-02-05 15:10:07 +01:00
omar
1dedbf8091
Style: Fixed missing style.MouseCursorScale initialization ( #939 ), messed up original commit badly.
2018-02-05 15:07:25 +01:00
omar
533fe8cb55
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-05 14:55:57 +01:00
omar
8ad88f725c
Nav: Minor tidying up. ( #787 )
2018-02-05 14:53:22 +01:00
omar
3f297e74e4
Merging the minor/shallow changes from Navigation branch.
2018-02-05 14:52:28 +01:00
omar
2081fc15b5
Added assert in BeginChild(ImGuiId id).
2018-02-05 13:42:34 +01:00
omar
223be68d77
Nav: Debugging stuff.
2018-02-05 13:42:33 +01:00
omar
66ff820eaa
Nav: Ensure g.NavScoringRectScreen is always finite and not inverted. ( #787 )
2018-02-04 18:30:46 +01:00
omar
0bd15b52a6
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-02-04 13:16:13 +01:00
omar
147ec8d1e2
Style Added style.MouseCursorScale, may remove ( #939 ).
2018-02-04 12:17:35 +01:00
omar
648de2fc00
Nav: Press Left on a child with ImGuiTreeNodeFlags_NavCloseFromChild moves you to parent node instead of closing it immediately. More standard. ( #787 , #1079 )
2018-02-02 18:38:18 +01:00
omar
ce9d7baaba
Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. ( #787 , #1079 )
2018-02-02 17:47:05 +01:00
omar
9120938200
Nav: Revert 5c9ea4d53a with comments. ( #787 )
2018-02-01 23:53:00 +01:00
omar
96ddfbc973
Nav: Modal windows can't be closed with Nav PadCancel. ( #787 )
2018-02-01 23:36:22 +01:00
omar
efbd8cebe7
Nav: Comments ( #787 )
2018-02-01 22:53:08 +01:00
omar
c4fc879508
CloseButton: Fixed cross positioning.
2018-02-01 22:33:48 +01:00
omar
942c140710
CloseButton: Fixed cross positioning.
2018-02-01 22:32:52 +01:00
omar
68d3e139a7
Nav: When focusing a parent window while closing a popup, hide its highlight for one frame to avoid potential double highlight and flicker with the common pattern of menu items leading to the opening other windows. ( #787 )
2018-02-01 22:28:58 +01:00
omar
950f260a32
Nav: Fixed Selectable/MenuItem Nav Highlight from using rounding when outer highlight stays square. ( #787 )
2018-02-01 22:25:25 +01:00
omar
c7b7b181b5
Nav: CloseButton reacts when clipped. ( #787 )
2018-02-01 22:13:25 +01:00
omar
5c9ea4d53a
Nav: Fixed press Left on sub-menu when parent wasn't a menu - we were just checking at the wrong level. ( #787 )
2018-02-01 21:33:23 +01:00
omar
eb737e0a42
Nav: Child window is restored on focus follow up. Fix bdd868704f. ( #787 , ~#727) One visible issue was pressing Left to leave a child menu.
2018-02-01 21:27:46 +01:00
omar
95f9c74b9a
Metrics: Displaying some of the important internal window flags.
2018-02-01 21:27:45 +01:00
omar
79ff3c2d49
Merge branch 'master' into navigation
2018-02-01 18:33:40 +01:00
omar
07163804df
Internals: Renamed CloseInactivePopups() to a better ClosePopupsOverWindow(). Exposed in imgui_internal.h
2018-02-01 18:31:41 +01:00
omar
5812d0b751
Nav: Using CTRL+TAB / PadFocusNext/Prev to Focus a window closes the previous window popups. ( #787 )
2018-02-01 18:29:30 +01:00
omar
fd6d8863f7
Nav: SetFocusID() clears NavInitRequest for consistency (repro would a same frame interaction / race condition). ( #787 )
2018-02-01 18:19:36 +01:00
omar
ef2c3bcdee
Nav: Fixed InitRequest leaking when changing window (repro was to navigate inside File->Options->[Child] then press Left and notice how we would land on parent window on the fist item after the current one). ( #787 )
2018-02-01 18:02:55 +01:00
omar
8cc2dbc3bd
Internals: Nav: Extracted code into IsWindowNavFocusable(). ( #787 )
2018-02-01 14:56:56 +01:00
omar
bdd868704f
Nav: Child window is restored on focus when returning to layer 0 or refocusing. This is a little experimental and potentially error-prone right now. ( #787 , vaguely relate to ~#727) Ideally we should maintain a non-sorted last-focused list that include childs windows.
2018-02-01 00:50:42 +01:00
omar
7b22a91578
Nav / Slider: Fixed reaching edge of integer slider with navigation input, bug introduced on January 25 in Nav branch 10a4a77b27. ( #787 )
2018-02-01 00:08:13 +01:00
omar
eaa6f490a2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2018-01-31 23:38:05 +01:00
omar
9bc5c089b6
Internal: Avoid needlessly bringing parent of front-most child back to front. This is mostly to reduce flicker/confusion in Metrics when traversing windows. We could aim at separating the child windows from non-child windows at some point.
2018-01-31 23:37:05 +01:00
omar
76d8af4036
Nav: when browsing a window that has no activable items (scroll only) we keep a highlight on the child. ( #787 )
2018-01-31 21:25:52 +01:00
omar
aa2dda7610
Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue.
2018-01-31 21:06:47 +01:00
omar
e6c0b212e8
Nav: Fixed initial movement (which sends an InitRequest) from clearing NavDisableHighlight and fully enabling Nav feedbacks. ( #787 )
...
NB: Setting g.NavInitResultExplicit = false on InitRequest match was added in initial commit c2cb2a6928
2018-01-31 18:53:15 +01:00
omar
9c8fb804ed
Log: Comments and extraneous assets to clarify intent. ( #1584 )
2018-01-31 17:41:26 +01:00
omar
27980d9688
Merge branch 'master' into context
2018-01-31 16:02:26 +01:00
omar
47e81a6194
Merge branch 'master' into navigation
2018-01-31 16:00:25 +01:00
omar
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
2018-01-31 16:00:07 +01:00
omar
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-31 15:43:19 +01:00
omar
596b6d6de2
Style: Enable window border by default. ( #707 )
2018-01-31 00:03:11 +01:00
omar
bebe03db05
Metrics: Minor formatting tweaks
2018-01-30 21:17:27 +01:00
omar
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
2018-01-30 20:07:12 +01:00
omar
9fc6f5907b
Nav: Fixed NavRectRel being cleared for one frame when restoring layer 0 with Alt/Menu key or Escape. Maybe was inconsequential. ( #787 )
2018-01-30 18:34:32 +01:00
omar
1ed7bce3ed
Nav: Removed old unused code. ( #787 )
2018-01-30 18:34:17 +01:00
omar
a8763d14c5
Internals: Renaming.
2018-01-30 15:08:53 +01:00
omar
38197a236d
Internals: Renaming.
2018-01-30 15:07:20 +01:00
omar
a7ad5134e5
Nav: window that are filling the entire display/viewport gets their windowing highlight clamped within. ( #787 )
2018-01-30 15:05:46 +01:00
omar
acf21ee429
Nav: Windows with ImGuiWindowFlags_NoBringToFrontOnFocus flag aren't temporarily displayed on the front when using CTRL-TAB. ( #787 )
2018-01-30 15:05:32 +01:00
omar
bed6ef03f5
Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. ( #787 )
2018-01-29 23:59:47 +01:00
omar
c851b33352
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ( #787 )
2018-01-29 23:59:46 +01:00
omar
b40dc5c4f2
Nav: NavScoreItem uses g.CurrentWindow and not g.NavWindow. This was changed as part of b3cba62b80 when first trying to implement the NavFlattenedFlag. As it turns out we won't need it. Committing separately for safety. ( #787 )
2018-01-29 23:59:43 +01:00
omar
020b153d35
Nav: calling NavMoveRequestCancel() more consistently when hijacking a request. Not strictly necessary. ( #787 )
2018-01-29 23:59:43 +01:00
omar
c8d8dc7f0a
Nav: Internals: Renamed RootNavWindow to NavRootWindow ( #787 )
2018-01-29 23:59:43 +01:00
omar
72485a5d04
Nav: Refactor NavMoveResult** flags into ImGuiNavMoveResult structure as we are going to want two instances of it. ( #787 ) (+1 squashed commits)
...
+ store window inside result.
2018-01-29 23:59:42 +01:00
omar
1cf38d0334
Internals: Nav: Renamed ImGuiNavForward enum ( #787 )
2018-01-29 18:12:32 +01:00
omar
4654040bcb
Nav: Comments, added enum to clarify NavForward code. ( #787 )
2018-01-29 17:35:36 +01:00
omar
c8b9b2c6bd
Nav: Mouse hovering selectable / menu items only activate them if they are on the active NavLayer. ( #787 )
2018-01-29 15:46:41 +01:00
omar
21771adb94
Nav: Debug overlay uses default font. ( #787 )
2018-01-29 15:35:51 +01:00
omar
3ded262776
Merge branch 'master' into navigation
2018-01-26 16:07:43 +01:00
omar
2d9d7a10ca
Scrollbar: Fix for ScrollbarY enable check after ScrollbarX has been enabled. ( #1574 ) Looks like a bug introduced in c36e586cce.
2018-01-26 11:43:43 +01:00
omar
1f3b66b10a
Scrollbar: Fix ScrollbarX enable test subtracting WindowPadding.x. This has been here since 65a191c005 ( #246 ) tho at the time it is possible that SizeContents wasn't calculated as evenly.
...
Test: auto-resize with: ImGui::Begin("Test", NULL, ImGuiWindowFlags_HorizontalScrollbar); ImGui::Button("##xxx", ImVec2(500,500)); ImGui::End();
2018-01-26 11:43:31 +01:00
omar
10a4a77b27
Nav: Drag, Slider: When already past a limit and pushing in the direction of the limit, we don't clamp values again. ( #787 )
2018-01-25 20:39:34 +01:00
omar
04d5783ffd
Nav: Cleaning up + using ImGuiInputSource source enum instead of a silly bool. ( #787 )
2018-01-25 19:36:38 +01:00
omar
d088bd86ad
Nav: Added keyboard moving and resizing via the CTRL-TAB windowing mode. ( #787 )
2018-01-25 19:25:30 +01:00
omar
486f0a8ba0
Fixed potential warning (forward declaration and definition didn't match signature. forward declaration only here for consistency)
2018-01-25 19:07:35 +01:00
omar
f2d5300408
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ( #787 )
2018-01-25 19:03:47 +01:00
omar
ed088b00be
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). ( #787 , #707 )
2018-01-25 18:50:30 +01:00
omar
e9070e768e
Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. ( #787 )
2018-01-25 16:17:36 +01:00
omar
5d31e1696f
Fix SetNextWindowContentSize() with 0.0f on Y axis (or SetNextWindowContentWidth()) overwriting the contents size. Broken in eab6333a0b. ( #1363 )
2018-01-25 15:37:24 +01:00
omar
5f7f27c8de
Nav: Comments. ( #787 )
2018-01-24 20:07:35 +01:00
omar
d404b93b6b
Nav: Mouse clicking on a window (to select/move) disables hides nav highlight. ( #787 ) + comments
2018-01-24 19:57:39 +01:00
omar
89b0ca1f8f
Nav: FocusWindow() doesn't reset NavRectRel (which was flickering e.g. when returning to a parent menu). This was added in the initial nav branch commit and I don't see a reason for it. ( #787 )
2018-01-24 19:55:56 +01:00
omar
f3776055d6
Merge branch 'master' into context
2018-01-24 19:31:11 +01:00
omar
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
2018-01-24 17:41:47 +01:00
omar
28671aa821
Nav: Internals: Moved some enums and functions to internals, renamed ImGuiNavReadMode to ImGuiInputReadMode as well. ( #787 )
2018-01-24 17:41:47 +01:00
omar
8227176c17
Nav: Menus: Fix for using Left direction inside a menu with widgets layed out horizontally. Left to close is now handled as a fallback inside EndMenu(). ( #787 )
2018-01-24 17:41:47 +01:00
omar
c09016b12a
Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. ( #787 )
2018-01-24 17:41:47 +01:00
omar
bd278e958e
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. ( #787 )
2018-01-24 17:41:47 +01:00
ocornut
680162eb32
Merge branch 'master' into navigation
2018-01-24 17:41:14 +01:00
omar
5148937d4d
Fixed old Begin() calling SetNextWindowBgAlpha() with negative values. ( #1567 , #1568 )
2018-01-24 17:39:21 +01:00
omar
37ee99983f
Clear BgAlphaCond properly after consuming it. Fixes 9a76fd30fd ( #1567 )
2018-01-24 15:09:02 +01:00
omar
64b786c2aa
Nav: Tweak/fixed popup positioning when using nav without the io.NavMovesMouse flag (it was always assuming a mouse cursor and allocating space for it) ( #787 )
...
Note that this bit include badly hardcoded sizes, expecting an improvement later.
2018-01-24 10:31:54 +01:00
omar
cea78cc576
Nav: Update hovered logic, so IsItemHovered and ButtonBehavior are more consistent with each other. The known case this fixes is nav focusing on a color button, tooltip appears, mouse move: previously tooltip would stay up. ( #787 )
2018-01-24 10:24:41 +01:00
omar
eb7ec781dc
Nav: Tweak GetNavInputAmount(). Split debug defines.
2018-01-23 21:56:15 +01:00
omar
f6ee8d30fb
Comments ( #1567 )
2018-01-23 19:21:17 +01:00
omar
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2018-01-23 19:16:43 +01:00
omar
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
2018-01-23 19:13:49 +01:00
omar
13c407591e
Nav: Comments, tweaks
2018-01-23 16:45:46 +01:00
omar
db2ba13154
Internals: Exposed SetCurrentFont() in imgui_internal.h
2018-01-23 16:33:06 +01:00
omar
9076366c17
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ( #1181 )
2018-01-23 09:57:49 +01:00
omar
1acb155419
Internals: Moved unnecessary MovingWindowMoveId field.
2018-01-22 14:31:20 +01:00
omar
5097368bd5
Tweaked FAQ.
2018-01-22 12:01:24 +01:00
omar
2026e792cd
Context: NewFrame() asserts ( #1565 )
2018-01-21 21:12:52 +01:00
omar
9edf211c0e
Merge branch 'master' into navigation
2018-01-21 20:46:50 +01:00
omar
3ed2ddbfbe
Metrics: Removed context size display.
2018-01-21 20:32:05 +01:00
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
(#1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
7e4d28a49d
Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
e45d7a7060
Context: Added IMGUI_DISABLE_DEFAULT_ALLOCATORS to disable linking with malloc/free. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
5a301c29dc
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. ( #1565 , #586 , #992 , #1007 , #1558 )
2018-01-21 20:16:54 +01:00
omar
ac5b7a1bdf
Comments
2018-01-21 20:10:23 +01:00
Panos Karabelas
7c8a19978d
Simplified return of ImGui::IsKeyReleased()
2018-01-21 16:02:09 +00:00
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! ( #939 )
2018-01-20 20:25:12 +01:00
omar
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
2018-01-20 12:36:16 +01:00
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
2018-01-20 12:06:06 +01:00
omar
d4bf9b4686
Renaming for consistency.
2018-01-19 15:47:10 +01:00
omar
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-19 15:42:28 +01:00
omar
e5a6e85f6d
Basic undocumented/unsupported combination of Child+Tooltip. The full feature needs substancially more work but this is enough for simplest cases. ( #1345 )
2018-01-19 15:37:25 +01:00
omar
42a612d7c9
Begin: Removed asserts that got in the way of some flags combination. ( #1345 )
2018-01-19 15:33:35 +01:00
omar
0978f00911
MovingWindow: Track click offset based on root window (undo 514d30d8cd). This should not affect the patch used for #1345 as the RootWindow for Child+Tooltip window points to itself now.
2018-01-19 15:14:53 +01:00
omar
74dc70c543
DragFloat: Fix/workaround for backends which do not preserve a valid mouse position when dragged out of bounds. ( #1559 )
2018-01-19 09:16:26 +01:00
omar
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.( #143 )
2018-01-18 17:32:34 +01:00
omar
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. ( #1555 ) + comments.
2018-01-18 10:06:58 +01:00
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. ( #1418 , #1554 )
2018-01-17 12:15:00 +01:00
omar
2f15cc0855
Nav: Fixed popup wrap-around logic for windows with scrolling. ( #787 )
2018-01-15 21:55:32 +01:00
omar
05885b2e6d
Merge fix.
2018-01-15 20:18:01 +01:00
omar
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-15 20:13:42 +01:00
omar
28a76af185
Internal: DrawData: Tidying, renaming.
2018-01-15 20:12:48 +01:00
omar
a77913054f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-01-15 18:02:58 +01:00
omar
1182174d81
Internals: DrawData: We don't need an intermediate layer for popups.
2018-01-15 18:00:13 +01:00
omar
0c06b43e6b
Metrics: Tweaks to hover-window-drawlist to see window bounding box.
2018-01-15 17:55:38 +01:00
omar
038453258e
Internals: DrawData: Refactored chunks into a ImDrawDataBuilder we can reuse.
2018-01-15 17:48:32 +01:00
omar
06eef2ce6f
Internals: DrawData: renamed fields only (committing separately so that next commit is less nosiy).
2018-01-15 17:48:32 +01:00
omar
6eff21ee5e
Revert "Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )"
...
This reverts commit 03f5cd6ca1
2018-01-15 16:19:01 +01:00
omar
514d30d8cd
MovingWindow: Track click offset based on MovingWindow and not its RootWindow. Followup to 3849bb4470. Comments + adding a local to ease patch #1345 .
2018-01-14 14:13:54 +01:00
Crunkle
daa38f2ad0
Fix cross compilers
2018-01-14 03:31:22 +00:00
omar
db63e71f13
Internals: Exposed SetCurrentFont() in imgui_internal.h
2018-01-12 20:07:01 +01:00
omar
1493de4f81
Internals: Merge of harmless stuff from Navigation stuff. Added GetHoveredID() internal helper.
2018-01-12 19:53:27 +01:00
omar
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ( #787 )
2018-01-12 19:28:37 +01:00
omar
c9be7d7254
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2018-01-12 19:21:12 +01:00
omar
0a98202714
Nav: Standardized FIXME-NAV marker.
2018-01-12 19:13:15 +01:00
omar
cc173d7619
Begin: FIx previous commit - no need to call on collapsed window. Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). ( #822 , #1542 )
2018-01-11 23:21:24 +01:00
omar
5e9ae92ae9
Begin: Handle manual resize (grip, border, gamepad) before setting up window DrawList main clipping rectangle. Sane (and required for viewport code). ( #822 , #1542 )
2018-01-11 23:17:34 +01:00
omar
f7b10fc954
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-11 18:18:44 +01:00
omar
6a1011cf53
MovingWindow: Proper fix for 651538e attempt, without altering MovingWindow which has side-effects. Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381 , #1337 )
2018-01-11 18:16:16 +01:00
omar
b74f24c3e5
Revert "Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381 , #1337 )"
...
This reverts commit 651538e13b
2018-01-11 18:08:14 +01:00
omar
1c95dea88c
Merge branch 'master' into navigation
2018-01-11 17:37:02 +01:00
omar
7d2a068dea
Begin: Shuffling bits of code around.
2018-01-11 17:33:37 +01:00
omar
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-11 16:49:59 +01:00
omar
651538e13b
Clicking on a window with the ImGuiWIndowFlags_NoMove flags takes an ActiveId so we can't hover something else. (ref #1381 , #1337 )
2018-01-11 16:43:03 +01:00
omar
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ( #1382 )
2018-01-11 13:51:18 +01:00
omar
67671c0ab5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-10 23:11:26 +01:00
omar
1eee10778b
Internals: Begin: Refactor some code into an UpdateManualResize() function.
2018-01-10 23:06:51 +01:00
omar
483f9b0d07
Internals: Begin: Moved DrawList setup code below, the viewport system will need to push the outer clipping rectangle as late as possible.
2018-01-10 22:55:29 +01:00
omar
03f5cd6ca1
Nav: Fixed RenderNavHighlight() clipping, essentially revert 6ea90af6b7. ( #787 )
2018-01-10 18:58:55 +01:00
omar
919fc548ad
Merge branch 'master' into navigation
2018-01-10 18:58:26 +01:00
omar
6c583315e6
Begin: Moving some code around for the benefits of the wip viewport branch.
2018-01-10 18:56:51 +01:00
omar
f610e25682
Internals: Using ImFloor().when appropriate.
2018-01-10 18:33:29 +01:00
omar
fe919995da
Merge branch 'master' into navigation
2018-01-08 16:35:12 +01:00
omar
933ee6cd5d
InputText: Added alternative clipboard shortcuts: Shift+Delete (cut), Ctrl+Insert (copy), Shift+Insert (paste). ( #1541 )
2018-01-08 16:01:30 +01:00
omar
fd4d63a0c5
InputText: Moved code for checking clipboard shortcut so we can expand on it. ( #1541 )
2018-01-08 15:56:01 +01:00
omar
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
2018-01-07 18:17:47 +01:00
omar
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
2018-01-07 18:13:01 +01:00
omar
3f4eccf154
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-07 16:22:09 +01:00
omar
3fc7cf190d
OpenPopup(): Always reopen existing popup. Removed OpenPopupEx() bool reopen_existing which is always true. This also makes the public API on par with OpenPopupEx(). ( #1497 , #1533 )
2018-01-07 16:20:02 +01:00
omar
deab2ab015
Popups: Gently handle the user mistakenly calling OpenPopup() every frame. (when reopen_existing is true). ( #1497 )
2018-01-07 16:15:54 +01:00
omar
69ff65f054
Internals: Popup: Renaming fields.
2018-01-07 16:11:25 +01:00
omar
3678307cd9
Popup, Menus: Tweaks and comments.
2018-01-07 15:56:14 +01:00
omar
369189b675
Internals: Popup: Explicitely setting up ImGuiPopupRef reduces confusion.
2018-01-07 15:40:46 +01:00
omar
e09852fc49
Popups: Revert aca23fd3f0 (Oct 20, 2017). Because 1) I can't seem to find a default. 2) The if is definitively faulty and would have been all true. 3) It looks like possibly the following commit 6ab737a4bb could have made this unnecessary. Not absolutly certain. (~#439)
2018-01-07 15:34:15 +01:00
omar
63e4677b81
Popup: BeginPopupContextItem(), BeginPopupContextWindow(), BeginPopupContextVoid(), OpenPopupOnItemClick() all react on mouse release instead of mouse click. Note that they don't use the full ButtonBehavior() or tracking aabb on both click and release. Applications I've tried seems to behave inconsistently there but on-release-without-tracking is both fairly common and doesn't require extra code for the id tracking. (~#439)
2018-01-07 15:23:57 +01:00
omar
c337cdcfd3
Internal: ButtonBehavior: Tweak to update g.ActiveIdClickOffset more consistently
2018-01-07 15:02:09 +01:00
omar
7ad169fa09
Merge branch 'master' into navigation + fix previous merge
...
# Conflicts:
# imgui.cpp
2018-01-07 14:33:44 +01:00
omar
d730a763f6
Internal: Reworked FocusFrontMostActiveWindow() so it fits the Nav branch usage as well.
2018-01-07 14:32:42 +01:00
omar
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-07 14:25:05 +01:00
omar
a34490239c
Internals: Popup: Separating MousePosOnOpen and PopupPosOnOpen. They are equal in the master branch but different in the navigation branch.
2018-01-07 14:03:56 +01:00
omar
5fd19f037f
Internals: renamed FocusPreviousWindow() to FocusfrontMostActiveWindow()
2018-01-07 12:48:11 +01:00
omar
2874aabb93
Internals: BringWindowToFront() iterate front to back, faster in majority of use cases.
2018-01-07 12:48:11 +01:00
omar
95b773370f
Revert "Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )" Will come up with a better design later.
...
This reverts commit 007f4034c9
2018-01-05 17:40:51 +01:00
omar
007f4034c9
Internals: Added LastActiveId, LastActiveIdTimer. ( #1537 )
2018-01-05 15:33:24 +01:00
omar
29c194b2a4
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2018-01-03 20:47:42 +01:00
omar
4fc9f44073
Merge of minor left-overs from private work branch to reduce drifts. Should be functionally a no-op.
2018-01-03 20:46:54 +01:00
omar
4b1240b2e1
Fixed non-popup child windows not honoring the HiddenFrames flag (can't see a reason). Docking relies on this.
2018-01-03 20:45:24 +01:00
omar
b2ec0741f1
Internals: Settings api tweaks
2018-01-03 20:45:17 +01:00
omar
2b8224692e
Merge branch 'master' into navigation
2018-01-03 20:26:24 +01:00
omar
0a0b252bb6
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
2018-01-03 17:02:51 +01:00
omar
33f7769d85
Columns: Clear offsets data when columns count changed. ( #1525 )
2018-01-03 14:38:01 +01:00
omar
f9b2058d5a
Internals: Renamed ImGuiSimpleColumns to ImGuiMenuColumns to avoid confusion. Reduced internal buffer size (we only use 3 slots).
2018-01-03 14:35:11 +01:00
omar
05ec0b0736
Casing tweaks + clarify license copyright (simpler/safer?) ( #1346 )
2018-01-03 14:32:16 +01:00
omar
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2018-01-03 12:33:27 +01:00
omar
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
2018-01-03 12:31:56 +01:00
omar
7fcbd45500
Internals: NextWindow: Renamed, moved functions to member.
2018-01-03 12:28:16 +01:00
omar
e339949de1
Internals: NextWindow: Using ImGuiCond for consistency.
2018-01-03 12:22:02 +01:00
omar
04b44398eb
Internals: refactored g.SetNextWindow fields into g.NextWindow. structure (so it can be more easily transported/copied)
2018-01-03 12:12:41 +01:00
omar
7e03ee8d85
Merge branch 'master' into navigation
2018-01-02 17:21:49 +01:00
Cory McWilliams
561e9f286e
Fix a memory leak of ImGuiColumnsSet's Columns vector. ImVector doesn't call destructors.
2018-01-02 10:46:20 -05:00
omar
170bcb2d7c
Internals: NewFrame: Shuffled some code around (to minimize upcoming patches)
2018-01-02 12:48:38 +01:00
omar
7a15fc8de5
Merge branch 'master' into navigation
2017-12-29 18:28:23 +01:00
omar
2dd2ca0096
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
...
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e
2017-12-29 17:59:13 +01:00
omar
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-29 13:39:07 +01:00
omar
4fbdb50dca
MenuBar: Fixed menu bar pushing a clipping rect outside of its allocated bound (usually unnoticeable).
2017-12-28 23:53:36 +01:00
omar
4ba2e85744
Demo: Tweak. Comments. Metrics: Added some Drag and Drop info.
2017-12-28 23:53:27 +01:00
omar
90ff4ae5d1
BeginPopupModal(): the conditional test for SetNextWindowPos() was polling the wrong window, which in practice made the test succeed all the time.
2017-12-28 23:52:47 +01:00
omar
e985baa35d
Combo: When peeking into the popup window for alignment we check if the window was active, which is more correct. (no known issue in current codebase, but we'll need that change for later)
2017-12-28 23:52:42 +01:00
omar
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
2017-12-28 23:52:37 +01:00
omar
563d04fdb1
TreeNode: node with the ImGuiTreeNodeFlags_Leaf flag correctly disable highlight when DragDrop is active. ( #143 , #581 )
2017-12-28 23:52:31 +01:00
omar
49eed6e2d1
Version 1.54 WIP
2017-12-28 15:17:35 +01:00
omar
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-26 15:37:31 +01:00
omar
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
2017-12-26 15:36:55 +01:00
omar
e916310b2e
Version 1.53
2017-12-25 17:41:41 +01:00
omar
ed2105d4a2
Merge branch 'master' into navigation
2017-12-25 16:45:27 +01:00
omar
3849bb4470
Moving window doesn't use accumulating MouseDelta so straying out of boundaries keeps moved window at the same spot.
2017-12-25 16:03:58 +01:00
omar
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-24 18:59:40 +01:00
omar
8d54b1b7af
Misc comments, removed duplicated IM_ARRAYSIZE macro in imgui_demo.cpp (it is now declared in imgui.h)
2017-12-24 18:59:14 +01:00
omar
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
2017-12-24 18:16:22 +01:00
omar
cead207535
Comments
2017-12-24 17:58:41 +01:00
omar
6c63c7a8b1
Various zealous warning fixes (thanks Clang). (Navigation branch)
2017-12-23 16:40:12 +01:00
omar
ffb4f6ca8c
Merge branch 'master' into navigation
2017-12-23 16:27:48 +01:00
omar
9cda86d55a
Internals: Added IM_NEW, IM_DELETE helper macros ( #1517 , #484 , #504 )
2017-12-23 16:24:33 +01:00
omar
983d8f5f8e
Various zealous warning fixes (Clang).
2017-12-23 15:28:49 +01:00
omar
53b24ff79a
Removed reliance on ImU64 type for the ImDrawList assert. ( #1184 )
2017-12-23 15:02:36 +01:00
omar
1f26652944
Various zealous warning fixes (thanks Clang).
2017-12-23 14:07:03 +01:00
omar
1c1e490316
Merge branch 'master' into navigation
2017-12-22 20:21:54 +01:00
omar
46dcd9aa50
Columns: Made PixelsToOffsetNorm() properly symetrical to OffsetNormToPixels() ( #125 )
2017-12-22 20:21:35 +01:00
omar
471bcf8b5e
Columns: Fixed dragging when using a same of columns multiple times in the frame. ( #125 )
2017-12-22 20:21:02 +01:00
omar
e1a103b251
Drag and Drop: Disable tracking mouse button ownership when an external drag source is active, to make it easier to achieve drag and drop over multiple OS windows. ( #143 )
2017-12-22 20:20:52 +01:00
omar
8d21ee56d2
ImDrawList, Font: Fixed bug introduced in 531c11d5c7 ( #1519 )
2017-12-22 20:19:48 +01:00
omar
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-21 19:55:21 +01:00
omar
c8c872c753
Internals: String functions uses size_t in their signature
2017-12-21 19:49:54 +01:00
omar
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
2017-12-21 19:49:54 +01:00
omar
d139bd088d
Begin: Moved modal darkening draw block
2017-12-21 19:49:54 +01:00
omar
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
2017-12-21 19:01:53 +01:00
omar
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
2017-12-21 18:52:34 +01:00
omar
230f826ef5
ImDrawList: Comments
2017-12-21 18:48:09 +01:00
omar
4c2514dc29
Merge branch 'master' into navigation
2017-12-21 11:18:42 +01:00
omar
6193f46af2
Active Modal window always set the WantCaptureKeyboard flag ( #744 )
2017-12-21 11:18:30 +01:00
omar
b366dd9322
BeginPopup: Moved flags into individual BeginPopupXXX calls/implementations and outside of BeginPopupex(). Removed _NoResize flag which is extraneous with AlwaysAutoResize.
2017-12-20 17:40:58 +01:00
omar
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
2017-12-20 16:25:03 +01:00
ibachar
abaf347deb
Added a flag for text input to disable undo / redo
2017-12-17 15:27:56 +02:00
omar
b1d90b565d
Columns: Fixed previous commit (wrong chunk commited) ( #125 )
2017-12-15 17:09:41 +01:00
omar
b9391d1692
Columns: Internal: Columns have their no set of flags so NoResize can be setup by internal code. ( #125 )
2017-12-15 17:06:47 +01:00
omar
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-12-15 11:59:50 +01:00
omar
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
2017-12-15 11:17:21 +01:00
omar
6effcf21d6
Drag and Drop: Source can also inhibit the preview on target, useful for extern sources that only exists for one frame. ( #143 )
2017-12-15 11:17:21 +01:00
omar
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
2017-12-15 10:15:51 +01:00
omar
eefea0588a
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. ( #1380 , #1502 )
2017-12-14 18:42:41 +01:00
Branimir Karadžić
ac8e708c3e
Fixed unused variable warning.
2017-12-14 18:14:43 +01:00
omar
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
2017-12-13 22:30:16 +01:00
omar
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-12-13 22:09:08 +01:00
omar
f265e16b84
Revert "Scrollbar: Minor simplication of the code using InnerRect data." > Introduced sheering on the scrollbar rectangle because InnerRect isn't setup at this point.
...
This reverts commit 7ac1583411
2017-12-13 22:07:18 +01:00
omar
ddbcda8c1b
Columns: Column width data is no longer lost while dragging toward the right side. ( #1499 , #125 )
2017-12-13 21:51:23 +01:00
omar
ba71e1c0e4
Columns: Minor stylistic fixes. ( #125 )
2017-12-13 21:48:56 +01:00
omar
f7c5f420e7
BeginChild() fix using negative sizes as window position because of erroneous clamping. It was hard to notice until we added asserts for it. ( #1500 )
2017-12-13 19:45:03 +01:00
omar
e8e84a6ad6
Columns: Added internal tracking of a few flag temporarily, to facilitate the work of third-parties who have columns patches. ( #125 )
2017-12-13 19:26:04 +01:00
omar
4ae5c7e227
Columns: Refactor: Moved ColumnsSet[] to window out of DC as they are persistent data for most + fix for pre C++11 compilers. ( #125 , #1499 )
2017-12-13 19:21:21 +01:00
omar
b016215c80
Columns: Refactor: Not using statestorage lookup anymore. ( #125 , #1499 )
2017-12-13 19:07:09 +01:00
omar
3a31a75e3b
Columns: Refactor: Renamed all members. ( #125 , #1499 )
2017-12-13 18:42:06 +01:00
omar
78320aa633
Columns: Refactor: Moved columns data into their own data structure. Minimum changes now to ease diffing. ( #125 , #1499 )
2017-12-13 18:41:51 +01:00
omar
027ffd91ea
IsWindowFocused(): oops, that was bound to happen with loosely typed enums (this is sort of why I made both values identical - no direct side effects).
2017-12-12 23:49:04 +01:00
omar
16fb58984f
Merge branch 'master' into navigation
2017-12-12 23:41:48 +01:00
omar
90d0b8b58b
Navigation: minor sync to reduce drifts between changes
2017-12-12 23:41:20 +01:00
omar
8b59ed0708
Drag and Drop: Exposed some internals.
2017-12-12 23:37:27 +01:00
omar
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
2017-12-12 23:36:25 +01:00
omar
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
2017-12-12 23:35:04 +01:00
omar
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
2017-12-12 20:44:12 +01:00
omar
d0a1be0de0
Merge branch 'drag_and_drop'
2017-12-12 20:39:52 +01:00
omar
ab049c6fc0
Drag and Drop: Fix merge for IMGUI_DISABLE_OBSOLETE_FUNCTIONS
2017-12-12 20:34:16 +01:00
omar
7faa5b16bb
Tweak
2017-12-12 19:15:00 +01:00
omar
3ea5e67ba2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-12-12 18:47:23 +01:00
omar
02e0a078f4
Begin: Tidying up code to make it more readable.
2017-12-12 18:46:42 +01:00
omar
28bbf1ade6
Fixed ParentWindow setup which broke Modal windows (fix c65124f415)
2017-12-12 18:45:57 +01:00
omar
d561a43a4d
Drag and Drop: Drop target infer a fallback ID from the rectangle. Avoid Preview being accepted on drop frame when drop target has no ID. ( #143 )
2017-12-12 18:17:37 +01:00
omar
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
2017-12-12 15:44:22 +01:00
omar
7ec934f439
Drag and Drop: Comments
2017-12-12 15:33:26 +01:00
omar
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
2017-12-12 15:02:05 +01:00
omar
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
2017-12-12 14:58:53 +01:00
omar
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
2017-12-12 14:14:58 +01:00
omar
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
2017-12-12 14:12:49 +01:00
omar
ee7f1921e8
Internals: Added GetSmallSquareSize()
2017-12-12 14:08:58 +01:00
omar
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
2017-12-12 14:07:12 +01:00
omar
c65124f415
Internals: ParentWindow is now NULL for non-child windows and means what everyone expects.
2017-12-12 12:50:43 +01:00
omar
f42d7b89e2
Internals: Removed misleading GetWindowParent() function. + renaming to clear confusing.
2017-12-12 12:50:42 +01:00
omar
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
2017-12-12 12:50:42 +01:00
omar
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
2017-12-11 22:42:12 +01:00
omar
45f440bb7d
Internals: Renamed ImGuiButtonFlags_FlattenChilds -> ImGuiButtonFlags_FlattenChildren, ImGuiButtonFlags_AllowOverlapMode -> ImGuiButtonFlags_AllowItemOverlap
2017-12-11 22:39:10 +01:00
omar
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:39:27 +01:00
omar
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-11 16:28:47 +01:00
omar
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
2017-12-11 16:19:37 +01:00
omar
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
2017-12-10 19:01:59 +01:00
omar
e3e0326ea9
Exposed BeginCombo() publicly.
2017-12-10 18:08:59 +01:00
omar
eab6333a0b
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ( #1490 )
2017-12-10 17:36:30 +01:00
omar
7ac1583411
Scrollbar: Minor simplication of the code using InnerRect data.
2017-12-10 17:27:37 +01:00
omar
a9b01600ac
Internals: window->InnerRect includes removal of borders so it'll be easier to use from other locations.
2017-12-10 17:24:10 +01:00
omar
b75acc21b0
Fix for border under title bar when WindowBorderSize == 0 and FrameBorderSize > 0
2017-12-10 16:48:18 +01:00
omar
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
2017-12-10 16:05:47 +01:00
Branimir Karadžić
e23083a080
Fixed warning: logical ‘and’ of equal expressions
2017-12-10 12:15:29 +01:00
omar
0365c524a2
ColorPicker4: Fixed returning true when holding mouse button on the sat/value/alpha locations. ( #1489 )
2017-12-09 21:25:20 +01:00
omar
a8c7b1a2a2
ColorEdit4: Made IsItemActive() return true when picker popup is active. ( #1489 )
2017-12-09 21:17:27 +01:00
omar
871a5cecc1
Merge branch 'master' into navigation
2017-12-08 18:32:46 +01:00
omar
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
2017-12-08 18:32:12 +01:00
omar
457011660e
Mouse wheel scrolling doesn't change speed inside Combo box (uses to slow down from 5 to 3) but instead slow down on window that are smaller than the scroll speed.
2017-12-08 18:28:17 +01:00
omar
a263dce2f2
Combo: Cleanup. Removed unrequired uses of the _ComboBox flag (the test in EndChild() is from commit no 1!). We could remove ImGuiWindowFlags_ComboBox soonish.
2017-12-08 17:21:45 +01:00
omar
9ce51ad9f6
Fix bad merge
2017-12-08 15:11:35 +01:00
omar
a6f37287d8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-08 15:06:37 +01:00
omar
7ac5f11b29
Standardizing the casing/format of internal window names + Misc comments.
2017-12-08 15:04:06 +01:00
omar
befc58771c
Combo: Recycling windows by using a stack number instead of a unique id, wasitng less windows.
2017-12-08 15:03:37 +01:00
omar
e998c7d3e3
Combo: Moved functions (untouched).
2017-12-08 15:03:32 +01:00
omar
a5e9392140
Combo: Added flags to BeginCombo() new api, removed explicit height, default to 8 instead of 7 items, allow popup height constraints via SetNextWindowSizeConstraints(), width expand if contents doesn't fit, popup reposition policy if it doesn't fit.
2017-12-08 15:03:26 +01:00
omar
d9d231dc6b
Internals: Renamed CalcSizeFullWithConstraint() to CalcSizeAfterConstraint() which is more appropriate + added explicit parameter to CalcSizeAutoFit() so it can be used externally.
2017-12-08 15:02:17 +01:00
omar
74f42baf3e
Fixed scrollbar issue, source size when explicit was read before applying custom size constraints (followup to cc2c023880 etc.)
2017-12-08 15:00:56 +01:00
omar
541dfd7901
Combo: Comments + fixed missing lower window padding.
2017-12-08 15:00:02 +01:00
omar
9872297a84
Internals: Renamed FindBestPopupWindowPos() to FindBestWindowPosForPopup()
2017-12-08 14:59:49 +01:00
omar
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
2017-12-08 12:48:53 +01:00
omar
b6b940c8ee
Merge branch 'master' into navigation + removed extraneous g.NavDisableMouseHover test in IsItemHovered()
...
# Conflicts:
# imgui.cpp
2017-12-08 09:35:23 +01:00
omar
e118239f69
IsItemHovered() comments ( #1382 )
2017-12-08 09:34:05 +01:00
omar
553b0fcf8f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-07 21:20:16 +01:00
omar
ca0bb000ad
Begin: Factored out a bit of code to CalcSizeContents()
2017-12-07 21:14:54 +01:00
omar
f658edc72a
Begin: Remove unnecessary usage of window_is_new flag, as both fields are zero on window creation.
2017-12-07 21:14:49 +01:00
omar
45466a8cf9
Internals: BeginCombo() added dummy ImGuiComboFlags.
2017-12-07 21:14:41 +01:00
omar
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
2017-12-07 21:14:25 +01:00
omar
7f2b9ea4c0
Begin: Minor refactor following fcf652f8ee7267055e331bf7a0133ed477816f27. Merging the if (Collapsed) block with the main one.
2017-12-07 21:14:13 +01:00
omar
8dcc1a8a20
Begin: Sizing fixes regarding uses SetNextWindowSize() on individual axises.
2017-12-07 21:14:00 +01:00
omar
e045eddd77
Minor tweaks. Using ImGuiAxis defines.
2017-12-07 21:13:23 +01:00
omar
92f7bd3605
Fixed 64-bit warnings.
2017-12-07 21:06:15 +01:00
omar
cc2c023880
Fixed scrollbar issue, followup to beda5fc5a0 and 2df8fa95df.
2017-12-07 17:04:53 +01:00
omar
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
2017-12-07 16:42:52 +01:00
omar
3c9f9a455e
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended. FIXED TYPO.
2017-12-07 16:36:07 +01:00
omar
8959c64b33
Internals: Cleanup FindBestPopupWindowPos() to be more digestible, since we are bounds to rework the logic there. No functional changes intended
2017-12-07 13:29:14 +01:00
omar
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
2017-12-07 12:49:52 +01:00
omar
6deb865f78
Nav: Merge fix.
2017-12-06 17:48:28 +01:00
omar
2fc6a82665
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-06 17:44:40 +01:00
omar
8f41508c52
Begin: Move the code that update the Appearing flag above the BeginDocked() branch.
2017-12-06 17:42:28 +01:00
omar
2fc9a2e6e7
Fixed nav branch merge issue.
2017-12-06 15:20:36 +01:00
omar
beda5fc5a0
Fixed scrollbar enable/disable calculation when size is modified programmatically. This is the generalization of the fix in 2df8fa95df.
2017-12-06 15:13:45 +01:00
omar
ecacaf7f2d
Lower-right resize grip only appears when hovered. ( #822 )
2017-12-06 15:13:45 +01:00
omar
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-06 15:13:45 +01:00
omar
531e559e49
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. ( #822 ) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
2017-12-06 15:13:45 +01:00
omar
e103fe8c1f
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-06 15:13:45 +01:00
omar
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
2017-12-06 15:13:45 +01:00
omar
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-12-05 22:56:35 +01:00
omar
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
2017-12-05 22:53:58 +01:00
omar
5686c72bbd
Windows can be resized from their borders when ImGuiWindowFlags_ResizeFromAnySide is set. ( #822 ) The interaction is currently unsatisfying because we can only reach a window from its inner rectangle (because of HoveredWindow filtering).
2017-12-05 22:47:20 +01:00
omar
b9dc0caee3
Tweak four-corners resize grip code. Added ImRect::FixInverted() helper. ( #822 )
2017-12-05 22:44:52 +01:00
omar
2ca4f9e862
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
2017-12-05 22:42:57 +01:00
omar
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-12-05 16:15:05 +01:00
omar
77d1a4b636
Fixed a one frame glitch, when window claiming focus themselves on appear, the title bar wouldn't use the focused color on that frame.
2017-12-05 16:12:45 +01:00
omar
16d9fa30b2
Merge branch 'master' into drag_and_drop
2017-12-05 09:21:07 +01:00
omar
5f7cd7fb1c
Internals: Splitter Behavior doesn't show a border. ( #319 )
2017-12-01 17:39:50 +01:00
omar
be6384eb2a
Style: Tweaked default WindowRounding value from 9 to 7 ( #707 )
2017-12-01 17:39:31 +01:00
omar
6ea744d8f4
Drag and Drop: Added DragSource from color square. Added DragTarget on ColorEdit4 widget. ( #143 )
2017-11-30 16:54:39 +01:00
omar
81cbaef806
Merge branch 'master' into navigation
2017-11-29 23:49:17 +01:00
omar
b513fdce48
Scrolling: SetScrollFromPosY() tweak to match change in a0d53fee81084a547bf21f46e736ea89f79fffb5 with similar desirable jump/discontinuity at each limit to skip the (ItemSpacing>WindowPadding) difference (followup to 0e5b64ecd2, #150 )
2017-11-29 23:48:32 +01:00
omar
c36e586cce
Style, Scrolling: Fixed padding and scrolling asymetry where lower/right sides of a window wouldn't use WindowPadding properly + causing minor scrolling glitches.
2017-11-29 23:48:32 +01:00
omar
25c159fac8
Internals: Removed unnecessary duplicate scrolling code + added extra infos to Metrics window.
2017-11-29 21:10:59 +01:00
omar
52e475230f
Settings: Internals: Renaming.
2017-11-28 23:16:09 +01:00
omar
2e1013a0c6
Settings: Internals: Simplifying code a bit. Creating Settings structure during first save. Windows where ImGuiWindowFlags_NoSavedSettings was late toggled will save settings correctly. ( #1000 )
2017-11-28 21:04:38 +01:00
omar
7ae71e4984
Settings: Internals: Added FindSettingsHandler()
2017-11-28 21:04:38 +01:00
omar
35eb5c5c99
Settings: Internals: Exposed FindWindowSettings(). Simplified some code.
2017-11-28 21:04:38 +01:00
omar
963259d128
Settings: Internals: Renamed ImGuiSettingsWindow to ImGuiWindowSettings.
2017-11-28 21:04:38 +01:00
omar
63712d5f5c
Merge branch 'master' into drag_and_drop
2017-11-28 17:28:45 +01:00
omar
9191b17218
Merge branch 'master' into navigation
2017-11-28 17:28:08 +01:00
omar
4a43632163
Build fix
2017-11-28 17:27:54 +01:00
omar
1a8a7c9d17
Settings: Import old style .ini file
2017-11-28 16:23:46 +01:00
omar
e5ebe42207
Settings: Make ImGuiWindow settings always first in the list.
2017-11-28 10:49:43 +01:00
omar
f3ec608c19
Settings: Initializing ImGuiSettingsWindow so external users don't end up with uncleared data. Exposed MarkIniSettingsDirty() in imgui_internal.h
2017-11-28 10:49:43 +01:00
omar
7e2d0d734c
Settings: basic refactor so that additional data structures can be loaded/saved. Parser/saver is still the minimum viable poor-man parsing.
2017-11-27 23:57:11 +01:00
omar
d552cabd15
Settings: Internal renaming of structure and fields names.
2017-11-27 23:57:10 +01:00
Emmanuel Benoît
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
2017-11-27 20:59:05 +01:00
omar
ade09b9e3c
Settings: Basic internal refactor to have functions for saving from/to memory (not exposed)
2017-11-27 19:02:40 +01:00
omar
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
2017-11-27 19:02:00 +01:00
omar
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
2017-11-24 16:56:17 +01:00
omar
46e994de4e
Nav: Do not clear last navigation id stored in a hidden child window. ( #787 )
2017-11-24 16:55:57 +01:00
omar
4e3c7f1557
Nav: Exposed NavInitWindow() in imgui_internal ( #787 )
2017-11-24 16:55:49 +01:00
omar
f5c47faee8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-24 16:55:31 +01:00
omar
6bd3b45b34
Sisyphus says: tweaked comments about not using old-style OpenGL examples ( #1459 , #1394 etc.)
2017-11-24 09:23:17 +01:00
stfx
6d3cfba834
Add Slider hover color just like Drag
...
I feel like there should be hover color options for each different control instead of the grouped frame color to make it usable for everyone. This also would not reduce performance as all controls already check for hover state as required by the ImGUI::IsHoveredItem() API.
2017-11-23 12:37:11 +01:00
omar
7763ab3fcc
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
2017-11-22 15:58:20 +01:00
omar
b618629d99
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-22 12:34:59 +01:00
omar
7d09a0ae99
Menu bar: better software clipping to handle small windows, in particular child window don't have the minimum constraint added in e9a7e73bba so we need to render clipped menus better.
2017-11-22 12:33:59 +01:00
omar
aafa6cece5
Tweak expression to be less weird (how did that ever happen?)
2017-11-22 11:26:16 +01:00
Giuseppe Barbieri
21b456e567
Update imgui.cpp
2017-11-22 11:19:52 +01:00
omar
68b26b4867
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-22 11:04:00 +01:00
omar
176d8fbe74
Fixed unreferenced variable warnings.
2017-11-22 11:02:42 +01:00
omar
302757447a
Internals: Added SplitterBehavior(). ( #319 )
2017-11-20 19:41:17 +01:00
omar
195abc3d17
Begin: Fix border size latch when rounding uses Child or Popup value. ( #707 )
2017-11-20 15:19:54 +01:00
omar
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-11-20 13:54:06 +01:00
omar
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
2017-11-20 13:53:16 +01:00
omar
7f447c8270
Color picker: Tweak vertex shading code, since we aren't shading between PrimReserve and PrimVert the code can be expressed more naturally. ( #346 )
2017-11-20 13:16:57 +01:00
omar
dc2768503f
Fix for drag and drop branch.
2017-11-19 16:24:17 +01:00
omar
92212b17aa
Merge branch 'master' into drag_and_drop
2017-11-19 16:23:37 +01:00
omar
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
2017-11-19 16:21:21 +01:00
omar
abbf836fd0
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 , fix #819 , #1031 , ref #1019 , ref #447 )
2017-11-19 15:56:51 +01:00
omar
c433bc971f
Reorder fields for consistency.
2017-11-19 14:58:10 +01:00
omar
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
2017-11-19 13:52:40 +01:00
omar
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
2017-11-19 12:06:45 +01:00
omar
538a704143
NewFrame(): using literal strings in the most-frequently firing IM_ASSERT expression to increase the odd of programmers seeing them (especially those who don't use a debugger).
2017-11-19 12:00:07 +01:00
omar
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
2017-11-19 00:39:37 +01:00
omar
4022ada843
Merge branch 'master' into drag_and_drop
2017-11-19 00:36:32 +01:00
omar
8a7f03cbf9
Combo: Offset popup position by border size so that a double border isn't so visible. ( #707 )
2017-11-19 00:29:59 +01:00
omar
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
2017-11-19 00:29:29 +01:00
omar
067605052d
Fix IsItemHovered() returning true for non-title bar hidden items that are clipped due to window collapsing logic. Fix 27fd1b913b. ( #823 )
2017-11-19 00:29:29 +01:00
omar
6f7b1bf2e1
Internals: Renamed ImGuiWindow::Accessed to WriteAccessed.
2017-11-19 00:29:29 +01:00
omar
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
2017-11-18 23:44:16 +01:00
omar
29e0078b66
Internals: Window minor internal renaming + added WindowRounding latch.
2017-11-18 19:06:11 +01:00
omar
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
2017-11-18 18:28:21 +01:00
omar
da2be7bbdc
Style: ScaleAllSizes() helper rounds down every values so they are aligned on integers.
2017-11-17 21:29:37 +01:00
omar
834fa52c8e
Columns: Added ImGuiColumnsFlags_GrowParentContentsSize to internal API to restore old content sizes behavior. ( #1444 , #125 )
2017-11-16 17:34:34 +01:00
omar
7746dd104c
Merge branch 'master' into drag_and_drop
2017-11-16 13:28:22 +01:00
omar
44c590393c
Merge branch 'master' into navigation
2017-11-16 13:28:10 +01:00
omar
29d962069d
Internals: Updating condition/allow flags with a function.
2017-11-16 13:28:01 +01:00
omar
4ad414c8d4
Internals: Window: Store whether the windows has a close button (we need that info for window/tabs dropping preview calculation)
2017-11-16 13:23:50 +01:00
omar
7c4be0a000
Internals: Added BringWindowToFront(), BringWindowToBack() helpers.
2017-11-16 13:11:49 +01:00
omar
6817f3a3d9
Merge branch 'master' into navigation
2017-11-15 23:44:50 +01:00
omar
e9a7e73bba
Windows with MenuBar have a larger minimum height to avoid artefacts (I fixed most of the vertical/horizontal artefacts, but the ones in rounded corners were too hard to fix).
2017-11-15 23:42:18 +01:00
omar
f36037b384
Menu: Fixed minor rendering issues on the right size with rounded window when resizing a window small.
2017-11-15 23:38:17 +01:00
omar
9b82d9fbef
Scrollbar: Minor graphical fix for when scrollbar don't have enough visible space to display the full grab.
2017-11-15 23:14:23 +01:00
omar
f5bdf443c9
Minor comments, tweaks
2017-11-15 22:37:43 +01:00
omar
5ea6e80da1
Make it possible to use SetNextWindowPos() on a child window. Useful internally.
2017-11-15 22:23:33 +01:00
omar
44b761b308
Merge branch 'master' into drag_and_drop
2017-11-15 14:41:27 +01:00
omar
27fd1b913b
Made it guaranteed by API that after calling Begin() the last Item represent the title bar. ( #823 )
2017-11-15 14:35:45 +01:00
omar
ae060b1d67
Merge branch 'master' into drag_and_drop
2017-11-15 10:24:54 +01:00
omar
64031852de
Merge branch 'master' into navigation
2017-11-14 23:17:58 +01:00
omar
64e79035d5
Scrollbar flicker fix for menus/popups (fixes 4d00dd8326 and 2df8fa95df). Hopefully right this time.
2017-11-14 23:17:28 +01:00
omar
6001d9c7a4
Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). ( #125 )
...
Demo: Columns: Adding a billion of extra lines and using clipper.
2017-11-14 22:41:54 +01:00
omar
ffad688fc8
Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )
2017-11-14 22:11:43 +01:00
omar
852ece3a0e
Fixed build ( 3e06450d27 not meant for master branch, but ok)
2017-11-13 16:04:03 +01:00
omar
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-11-13 15:19:43 +01:00
omar
3e06450d27
Internals: Added ArrowButton() helper.
2017-11-13 15:18:31 +01:00
omar
7908cce25f
Drag and Drop: Added internal BeginDragDropTargetCustom() convenient to avoid submitting dummy ItemAdd. ( #143 )
2017-11-13 15:17:41 +01:00
omar
4d00dd8326
Fixed scrollbar flickering on/off when uncollapsing a window (fixes 2df8fa95df)
2017-11-13 15:15:48 +01:00
omar
30bf40195b
io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )
2017-11-12 16:06:44 +01:00
omar
669498ff26
Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 , #650 )
2017-11-12 16:03:09 +01:00
Branimir Karadžić
9daac64ff8
Clean g.WindowsById storage on shutdown.
2017-11-11 10:01:50 +01:00
omar
06075f20ba
Merge branch 'master' into navigation
2017-11-10 11:42:08 +01:00
omar
ba09de3a39
Begin: Fixed appending into a child window with a second Begin() from a different window stack querying the wrong window for the window->Collapsed test.
2017-11-10 11:38:01 +01:00
omar
8451855a30
ButtonBehavior: Fixed ImGuiButtonFlags_AllowOverlapMode to avoid temporarily activating widgets on click before they have been correctly double-hovered. ( #319 , #600 )
2017-11-09 20:20:02 +01:00
omar
4b94738c7e
Drag and Drop: Drop target rectangle goes out of clipping range ( #143 )
2017-11-09 20:18:17 +01:00
omar
b1653cd361
Drag and Drop: Allow NULL payload (since type only can be useful). ( #143 )
2017-11-09 20:18:05 +01:00
omar
a297cbafdb
Merge branch 'master' into navigation
2017-11-08 23:17:14 +01:00
omar
2df8fa95df
Fixed vertical scrollbar flickering/appearing, typically when manually resizing and using a pattern of filling available height (e.g. full sized BeginChild). THIS IS A GREAT FIX, this glitch was nasty and annoying (and yet somehow nobody reported it?). Hopefully haven't broken anything else...
2017-11-08 23:17:08 +01:00
omar
a4cc3d4637
Minor tweaks/comments. Note that the reordering the one subtraction caused subtle havoc before the patch in 9ac8820ee2.
2017-11-08 22:36:31 +01:00
omar
9ac8820ee2
Fixed non-pixel aligned bounding box of window resize grip, / which triumphally led to any re-arrangement of operations inside the resize grip code outputting non-exact size_target values which led to unstable window position because clamping code uses size in a subtraction, etc etc. Lovely how a whole system can be made to act weird with a single bad input.
2017-11-08 22:32:22 +01:00
omar
b6504b8eee
Drag and drop: Handle overlapping drag target priorities given their surface, which appears to make most sense for drag and drop operations.
2017-11-08 15:47:52 +01:00
omar
2ab27be3de
Child window with MenuBar use regular WindowPadding.y so layout look consistent in child or in a regular window.
2017-11-07 22:23:20 +01:00
omar
41862b8c0e
ButtonBehavior: Fixed ImGuiButtonFlags_NoHoldingActiveID from incorrectly setting ActiveIdClickOffset, which probably have no known effect, but it is more correct this way. ( #1418 )
2017-11-07 16:41:58 +01:00
omar
1870738880
LowerBound() minor tweaks
2017-11-07 14:05:48 +01:00
omar
571b08f315
Internal: FindWindowByName() faster and doesn't touch every windows
2017-11-07 13:59:55 +01:00
omar
2c7ba21417
Fixed auto-resize allocating too much space for scrollbar when SizeContents is bigger than maximum window size (fixes c0547d358d) ( #1417 )
2017-11-07 11:37:38 +01:00
omar
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
2017-11-06 23:58:28 +01:00
omar
f0b4097c54
Begin: Simplified code and fixed a bug where appending into a window a second time (from a remote window) would incorrectly overwrite RootWindow with the current window in the stack. Our docking code uses this pattern.
2017-11-06 23:55:40 +01:00
omar
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
2017-11-06 20:04:10 +01:00
omar
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets ( #143 )
2017-11-06 19:39:23 +01:00
omar
16a5da9521
RenderTriangle() minor tweak to align Left/Right and Up/Down arrow extents visually
2017-11-03 20:20:25 +01:00
omar
553bdeedf7
Drag and Drop: Made it legal to not call SetDragDropPayload() between BeginDragDropSource() and EndDragDropSource(). ( #143 )
2017-11-02 18:30:46 +01:00
omar
3461a2f296
Merge branch 'master' into drag_and_drop
2017-11-02 18:06:04 +01:00
omar
982ce50b37
IsWindowHovered() returns true when moving window ( #1382 , #1404 )
2017-11-02 16:44:32 +01:00
omar
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
2017-11-02 16:44:24 +01:00
omar
803ac3a5c6
IsWindowHovered() Fix behavior when an item is active to use the same logic as IsItemHovered() ( #1382 , #1404 )
2017-11-02 16:23:03 +01:00
omar
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
2017-11-01 17:25:42 +01:00
omar
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-11-01 15:09:23 +01:00
omar
6ab20ff9bf
Minor tweaks to the user guide.
2017-11-01 12:33:58 +01:00
omar
e55caf0b95
Merge pull request #1402 from elect86/patch-1
...
Minor fix typo
2017-10-30 09:51:49 +01:00
omar
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
2017-10-30 09:50:54 +01:00
Giuseppe Barbieri
9e3f9fc2dd
Update imgui.cpp
2017-10-30 09:35:42 +01:00
omar
5956fff7e2
Drag and Drop: ImGuiButtonFlags_PressedOnDragDropHold focuses the target window.
2017-10-30 00:10:05 +01:00
omar
a810619555
Drag and Drop: Added support for drag and drop hold-long-to-open for CollapsingHeader() and TreeNode(). Open only!
2017-10-30 00:03:04 +01:00
omar
1d7d8f8574
Merge branch 'master' into drag_and_drop
2017-10-29 23:49:24 +01:00
omar
b13d281356
Maintaining ActiveIdTimer and HoveredIdTimer (the later is useful for drag and drop, both will be of course for creators of custom widgets)
2017-10-29 23:49:01 +01:00
omar
d46772b429
Comments
2017-10-29 23:14:17 +01:00
omar
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
2017-10-29 23:10:44 +01:00
omar
b5f714e9f9
Drag and Drop: made BeginDragDropSource() clear the IsItemHovered() by default, added a flag to keep it.
2017-10-29 21:31:49 +01:00
omar
c5536e49ef
Drag and drop API experiment
2017-10-29 21:15:02 +01:00
omar
17dd8e7c30
Merge branch 'master' into navigation
2017-10-27 23:01:54 +02:00
omar
b9ebb34a04
Nav: ColorButton: Fixed a case of not using local 'hovered' flag directly, messes with some of my drag and drop work, and I can't find/understand the reason why this was left as is (there _was_ a reason at the time but it appears to be obsolete now?)
2017-10-27 20:54:48 +02:00
omar
f962ca0b01
ColorTooltip: Resize ColorButton to align better with text, now that ColorButton provides a text baseline ( 0260fdd1c6)
2017-10-27 20:36:51 +02:00
omar
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
2017-10-27 20:04:51 +02:00
omar
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
2017-10-27 20:01:30 +02:00
omar
77df1ba9e0
Version 1.53 WIP
2017-10-27 19:54:56 +02:00
omar
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
2017-10-27 18:21:30 +02:00
omar
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
2017-10-27 17:27:53 +02:00
omar
9f200d10d5
Version 1.52
2017-10-27 17:10:41 +02:00
omar
cc78e9a213
Merge branch 'master' into navigation
2017-10-27 16:46:03 +02:00
omar
267ea506de
Begin: Fix for unused "Debug" (fix for 3b83cd24f5 )
2017-10-27 16:45:56 +02:00
omar
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-27 16:42:06 +02:00
omar
3b83cd24f5
Begin: Moved some code inside of the big if (first_begin_of_the_frame) scope
2017-10-27 16:39:55 +02:00
omar
3656f2c769
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
2017-10-27 16:39:23 +02:00
omar
a6edd10ee6
NewFrame: Removed unnecessary call to FindHoveredWindow() and simplified code (went through this multiple times, hopefully haven't broken anything)
2017-10-27 16:38:14 +02:00
omar
6243252d5a
Internal: BeginTooltipEx() in imgui_internal.h
2017-10-27 16:21:12 +02:00
omar
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
2017-10-27 15:53:59 +02:00
omar
d42f6bb6cc
Merged a bit of code from Navigation branch to ease further merging (InnerRect is currently not required in the Master branch)
2017-10-27 15:52:45 +02:00
omar
c432fcf2bb
Minor renaming.
2017-10-27 12:01:52 +02:00
omar
549f9e3f03
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
2017-10-25 16:37:10 +02:00
omar
daef33e268
Comments about mouse setup and clearing HoveredWindow when mouse down isn't owned by imgui (will affect some future hovered test and drag'n drop patterns) ( #143 , #1382 , #1392 )
2017-10-25 11:01:41 +02:00
omar
4faf99eff5
Added most basic form of Disabled flag to disable interactions (but visuals aren't altered), in imgui_internals.h, undocumented/unsupported ( #211 , #1012 )
2017-10-25 09:28:54 +02:00
omar
fc25881207
Merge branch 'master' into navigation
2017-10-24 21:13:24 +02:00
omar
efcd53a0c3
Removed direct dependency on sprintf() in imgui.cpp ( #1038 )
...
(NB: imgui_demo stills uses it)
2017-10-24 20:57:41 +02:00
omar
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ( #1038 )
2017-10-24 20:48:29 +02:00
omar
8fd5620277
Renamed IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCS to IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS/IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS for consistency. (ref #238 , #520 , #738 )
2017-10-24 20:23:42 +02:00
omar
7d2cd0e6ff
Added IMGUI_DISABLE_FORMAT_STRING_FUNCTIONS support in imconfig.h ( #1038 )
2017-10-24 20:19:32 +02:00
Patrick Doane
70cb427469
Add missing CloseClipboard call
2017-10-24 20:12:42 +02:00
omar
d513546325
Merge branch 'master' into navigation
2017-10-24 15:49:01 +02:00
omar
5b062c4c29
Fixed typos
2017-10-24 15:26:04 +02:00
omar
0260fdd1c6
ColorButton: As a small convenience, provide a text baseline.
2017-10-24 14:38:32 +02:00
omar
e9ff7162bc
ColorButton: Fixed rendering color button with a checkerboard if the transparency comes from the global style.Alpha and not from the actual source color.
2017-10-24 10:43:41 +02:00
omar
97bf2131e2
Fixed calling SetNextTreeNodeOpen() on a collapsed window leaking to next frame.
2017-10-23 14:37:47 +02:00
omar
20983773f1
Nav: MainMenuBar now releases focus when user gets out of the menu layer. WindowingTarget when applying focus to a window with only menus automatically sets the layer. ( #787 )
...
This is enough for basic mouse/gamepad usage, but 1- previous window gets an unfocused title bar color temporarily, 2- generaly for gamepad and especially keyboard we need much more to get this done right
2017-10-23 12:38:39 +02:00
omar
025d4f0c97
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
2017-10-23 12:34:46 +02:00
omar
e7922b3fa0
Factorized some code (+ declared as static function without namespace, a pattern with the Nav branch has started to use)
2017-10-23 12:34:15 +02:00
omar
2ef2c104a1
Begin: Minor tweaks
2017-10-23 11:36:43 +02:00
omar
be12f8c55d
Nav: Fixed handling of ImGuiNavInput_KeyMenu so it doesn't set g.NavWindowingTarget at all, reducing size effects + handling menu layer toggle on Alt Release ( #787 )
2017-10-23 11:26:52 +02:00
omar
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
2017-10-23 11:26:30 +02:00
omar
d769e2515a
Merge branch 'master' into navigation
2017-10-23 10:05:36 +02:00
omar
1bc1751670
MenuItem(): Tweaks to mimic exact spacing of BeginMenu() when inside a menu bar, which is a little misleading imho but may be useful. ( #1387 )
2017-10-22 10:56:37 +02:00
omar
b177f2432d
MenuItem(): Tweak to not draw over all horizontal space when in horizontal layout mode. ( #1387 )
2017-10-22 10:36:22 +02:00
omar
5fa81f2a26
Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
...
Remove the move/resize behavior that appears than holding the button for a while. (#787 )
2017-10-20 22:12:10 +02:00
omar
1c5b3fb1d2
Merge branch 'master' into navigation
2017-10-20 21:17:57 +02:00
omar
f7259e60ee
Comments
2017-10-20 21:17:51 +02:00
