omar
|
4ff23d3306
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
7 years ago |
|
omar
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
7 years ago |
|
omar
|
023cc25c7c
|
Internals: Removed unnecessary allocation indirection for g.LogClipboard (this only made sense when there was a global context instance)
|
7 years ago |
|
omar
|
ed756d474e
|
Internals: Added ImGuiDataType_Uint32 data type which is usable with InputScalarEx().
|
7 years ago |
|
omar
|
92f0165f85
|
DragFloat, SliderFloat: Rounding scalar using the provided format string instead of parsed precision. (#648)
|
7 years ago |
|
omar
|
6881d065b8
|
DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. (#648)
|
7 years ago |
|
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.
|
7 years ago |
|
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)
|
7 years ago |
|
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.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
da70c837da
|
Viewport: Removed unnecessary fields (now that the coordinate system is consistent accross viewports): MouseRefPrevViewport, MouseClickedPosViewportId. (#1542)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
5979233a3c
|
Misc: tweaks + minor changes merged from master to reduce branch drift. Removed code that ended up unused.
|
7 years ago |
|
omar
|
0b1d6a0d52
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
7 years ago |
|
omar
|
e3453d0dc4
|
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
|
7 years ago |
|
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
|
7 years ago |
|
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).
|
7 years ago |
|
omar
|
cc882b0723
|
Viewport: Tidying up AddUpdateViewport() calls. Moved flags argument. Removed extraneous mid-frame call to FindPlatformMonitorFromRect(). (#1542)
|
7 years ago |
|
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)
|
7 years ago |
|
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.
|
7 years ago |
|
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.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
637d9c42bf
|
Viewport: WIP for Tooltips, Popups, Menus to create their own viewport. Resizing a window allows it to leave the main viewport. (#1542)
|
7 years ago |
|
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
|
7 years ago |
|
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)
|
7 years ago |
Doug Binks
|
1e41bad90f
|
Added DisplaySafeAreaPadding to MainMenuBar height and fixed starting x position. Fixes main menu bar problems with TVs. (#1439)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
50e453a3e2
|
Viewport: Comments, tweaks, renaming. Removed unnecessary stuff. Fixed zealous Clang warning. (#1542)
|
7 years ago |
|
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))
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
e25da4230b
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
bfc0efaae9
|
Internals: Window: Aggregating ImDrawList into the ImGuiWindow structure.
|
7 years ago |
|
omar
|
83bd3595a4
|
Viewport: Merged ImGuiPlatformData into ImGuiPlatformIO. Comments. (#1542)
|
7 years ago |
|
omar
|
52cac135c9
|
Internals: Renamed GetFrontMostModalRootWindow() to GetFrontMostPopupModal() and exposed in imgui_internal.h (#1738)
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
7 years ago |
|
omar
|
3a29ddbcfa
|
Version 1.60
|
7 years ago |
|
omar
|
6d0c720451
|
Internals: Removed unused internal variant of ArrowButton().
|
7 years ago |
|
omar
|
82b7a39f31
|
Fixed a few zealous warnings.
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
e88fb10d7c
|
NewFrame: Extract some code into a NewFrameUpdateHoveredWindowAndCaptureFlags() which can be of use with touch-based inputs systems.
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
72899318e6
|
Viewport, Platform, Examples: Added support for transparent window via PlatformIO Platform_SetWindowAlpha (#1542) + fixes for GLFW 3.3
|
7 years ago |
|
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
|
7 years ago |
|
omar
|
78610a54d2
|
Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
b69dc45f6e
|
Internals: Removed ImGuiDataType_Float2.
|
7 years ago |
|
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.
|
7 years ago |
|
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
|
7 years ago |