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
|
7a41e0b1ea
|
Platform: Added platform_io.Platform_SetWindowFocus, Platform_GetWindowFocus function wrappers (unused yet). Exact specs tbd because our simplified concept of focus doesn't necessary match the more complex OS native concepts. (#1542)
|
2018-04-25 15:15:14 +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
|
423577e14e
|
Viewport, Platforms: SDL: Fixed initial focus click being ignored as a mouse button. GLFW: Fixed mouse cursor support for multi-viewport with GLFW 3.3 (current master) - somehow doesn't appear to work with GLFW 3.2 but I'm not too fussed about it. (#1542)
|
2018-04-23 16:46:25 +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
|
17a7f352b5
|
Viewporrt. Examples: DirectX10,11: Make the platform SetWindowSize handler not crash on failure to resize, which could happen (rarely) on invalid data or bug in the code.
|
2018-04-19 17:23:43 +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
|
6beafe555c
|
Update issue template so that removing the carriage return doesn't merge the user's text with the list/bullet item.
|
2018-04-19 14:47:29 +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
|
bcac02809f
|
Examples: Allegro 5: Renamed bindings from imgui_impl_a5.cpp to imgui_impl_allegro5.cpp.
|
2018-04-18 21:55:12 +02:00 |
|
omar
|
3913297384
|
Examples: Allegro 5: Added support for 32-bit indices setup via defining ImDrawIdx, to avoid an unecessary conversion (Allegro 5 doesn't support 16-bit indices).
|
2018-04-18 21:51:14 +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 |
|