omar
|
24aeca3d0c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# examples/imgui_impl_vulkan.h
# examples/imgui_impl_win32.cpp
|
6 years ago |
|
omar
|
a48815b870
|
Comments, changelog
|
6 years ago |
|
omar
|
93b032ea92
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
2bdf0b54a2
|
Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().
|
6 years ago |
|
omar
|
c665c15a7d
|
Nav: When entering into a NavFlattened child we only consider the visible items for scoring (note that this only work assuming the NavFlattened child window has interactive items). Fixes accidentally hoping into a NavFlattened child. (#767)
|
6 years ago |
|
omar
|
f4120e20d5
|
Nav: NavFlattened: Fixed navigation miscrolling parent window when the current window is scrolling enough to keep the item in view. Fix feature added in e11610d6, typically affect large navigation steps (used by PageUp/PageDown). + comments (#787)
|
6 years ago |
|
omar
|
d4b151076c
|
Internals: Added BeginDragDropTooltip() internal function to convey semantic (drag and drop tooltip doesn't get clipped within display boundaries). Revert part of 3218666fb9. (#1739, #143).
|
6 years ago |
|
omar
|
92b7d6bc4f
|
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143)
|
6 years ago |
|
omar
|
7fd9199a1d
|
Internals: Selectable: Renamed variables. Todo update.
|
6 years ago |
|
omar
|
929522febe
|
Missing examples changelog bits and todo list
|
6 years ago |
|
omar
|
03c8a78f04
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# 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
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
|
6 years ago |
|
omar
|
002e513b82
|
Added float GetWindowDpiScale(). (#1542, #1676)
|
6 years ago |
|
omar
|
7c7e96e1aa
|
ImVector: added erase(it first, it last) helper. Added erase_unsorted(it) helper. + todo fixes/additions
|
6 years ago |
|
omar
|
01429e7d16
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
86f8cdbd98
|
Comments + Internals: Selectable: decoupled internal flags and removed their menu / menu-item semantic as upcoming changes are requiring more flexibility.
|
6 years ago |
|
omar
|
b0fb340b57
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
6 years ago |
|
omar
|
85f3ba844c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
7 years ago |
|
omar
|
39f4761ff7
|
TODO list update + Changelog and comments for #1803.
|
7 years ago |
|
omar
|
8da0d42ef2
|
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType (#320, #643, #708, #1011)
|
7 years ago |
|
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
|
7640439747
|
DragInt: Patch old format strings to replace %f by %d when using the DragInt() entry point. (#320, #643, #708, #1011)
|
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
|
e3e4b7bdf5
|
Viewport: Fixed mouse hover flicker on mouse button release frame after moving a window. (#1542)
Platform: Clarifying some comments in back-ends.
|
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
|
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)
|
7 years ago |
|
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)
|
7 years ago |
|
omar
|
d1c16d4ccd
|
Documentation bits. Misc comments.
|
7 years ago |
|
omar
|
c1bdab6d5b
|
Comments about io.WantCapture flags + todo entries.
|
7 years ago |
|
omar
|
166411287f
|
Demo: Added more complete Combo demo. (#1658)
|
7 years ago |
|
omar
|
33ad8b2f0c
|
Nav: Track nav input source more generally (gamepad vs keyboard) (#787) + update todos and demo tweaks
|
7 years ago |
|
omar
|
533c86a7a3
|
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
|
7 years ago |
|
omar
|
111ea7af77
|
Misc comments, todos + reintroduced removed ImGuiCol defines under !IMGUI_DISABLE_OBSOLETE_FUNCTIONS wrap.
|
7 years ago |
|
omar
|
1ef1acbd8d
|
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
|
7 years ago |
|
omar
|
ed4bbc4fd4
|
Nav: Comments, guides.
|
7 years ago |
|
omar
|
0c0d811859
|
Nav: SetItemDefaultFocus() doesn't make the navigation cursorr highlight visible. Renamed NavInitResultExplicit to NavInitRequestFromMove. (#787)
|
7 years ago |
|
omar
|
efbd8cebe7
|
Nav: Comments (#787)
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
aa2dda7610
|
Nav: Tweak code to be easier to follow + updated todo list after clarifying an issue.
|
7 years ago |
|
omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
7 years ago |
|
omar
|
22f7de0fbd
|
Nav: Updated TODO list.
|
7 years ago |
|
omar
|
bed6ef03f5
|
Nav: workaround to kindly handle ALT-TAB without detecting TAB-release on backends that clear all keys on unfocus. (#787)
|
7 years ago |
|
omar
|
3ded262776
|
Merge branch 'master' into navigation
|
7 years ago |
|
omar
|
f2d5300408
|
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. (#787)
|
7 years ago |
|
omar
|
2c7324da56
|
TODO list, added uSynergy README
|
7 years ago |