omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
6 years ago |
Torkel Bjørnson-Langen
|
1441756a0f
|
Doc: Fixed comments referring to LoadFromFileTTF() instead of AddFontFromFileTTF() (#2153)
|
6 years ago |
|
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
f3e642322f
|
Demo: Removed one level of indentation in the ShowDemoWindowXXX functions (6 kb worth of spaces!). Will break some merge/PR.
|
6 years ago |
|
omar
|
eed1fba157
|
Demo: Split the contents of ShowDemoWindow() into smaller functions as it appears to speed up link time with VS. (#2152)
|
6 years ago |
|
omar
|
ac9aaf4b6e
|
Comments in demo and opengl code + Internals: Added HoveredIdNotActiveTimer tracking hovering time unless the item is active, which is a commonly useful pattern.
|
6 years ago |
|
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
000c1fc221
|
Demo: Added comments / tweaks related to the popups.
|
6 years ago |
|
omar
|
90b50bd4c3
|
Window: Added ImGuiWindowFlags_NoBackground flag for consistency and to ease creating new flag combinations. Added ImGuiWindowFlags_NoDecoration helper flag which is essentially NoTitleBar+NoResize+NoScrollbar+NoCollapse. (#1660)
|
6 years ago |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
0fe48cbb61
|
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.(#2035, #2096)
Added misc/README file.
|
6 years ago |
|
omar
|
3a7828de6b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
6 years ago |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
6 years ago |
|
omar
|
61d94ff88e
|
Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
|
6 years ago |
|
omar
|
3d318a6577
|
ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different.
Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.
|
6 years ago |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
d014d0285a
|
DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. (#2024)
|
6 years ago |
|
omar
|
e2436ca625
|
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
|
6 years ago |
|
omar
|
eb7033e75b
|
Version 1.66 WIP
|
6 years ago |
|
omar
|
b974fffea0
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
e0cab5664a
|
Version 1.65
|
6 years ago |
|
omar
|
a2616c79fe
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
|
omar
|
e58bc3d5b7
|
Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. (#2036)
|
6 years ago |
|
omar
|
8601c39571
|
Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542)
|
6 years ago |
|
omar
|
af27ec296b
|
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
65876f348a
|
Nav: Removed the [Beta] tag from various descriptions of the gamepad/keyboard navigation system. Although it is not perfect and will keep being improved, it is fairly functional and used by many. (#787)
|
6 years ago |
|
omar
|
77ba883f23
|
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.
|
6 years ago |
|
omar
|
bbcc976739
|
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
|
6 years ago |
|
omar
|
a848807847
|
Minor inconsequential merges from Master/Docking branches
|
6 years ago |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
6 years ago |
|
omar
|
bcb1441ce7
|
Version 1.65 WIP
|
6 years ago |
|
omar
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
48db5713d6
|
Version 1.64
|
6 years ago |
|
omar
|
6c34bffbb5
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
f2aa124eb8
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
6 years ago |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
3612885dea
|
Comments, demo
|
6 years ago |
|
omar
|
0810d57819
|
Renamed IsItemDeactivatedAfterChange() to IsItemDeactivatedAfterEdit() for consistency with new IsItemEdited() API. Kept redirection function (will obsolete fast as IsItemDeactivatedAfterChange() is very recent). (#820, #956, #1875, #2034)
|
6 years ago |
|
omar
|
e28b1078f5
|
Added IsItemEdited() to query if the last item modified its value (or was pressed). This is equivalent to the bool returned by most widgets. It is useful in some situation e.g. using InputText() with ImGuiInputTextFlags_EnterReturnsTrue. (#2034)
|
6 years ago |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
|
omar
|
ea9f5d7600
|
Added optional misc/stl/imgui_stl.h wrapper to use with STL types (e.g. InputText with std::string). (#2035, #2006, #1443, #1008)
|
6 years ago |
|
omar
|
8d639ec60d
|
InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. (#2006, #1443, #1008).
|
6 years ago |
|
omar
|
9f393c38e9
|
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
|
6 years ago |
|
omar
|
4de6e1f7e4
|
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
|
6 years ago |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
9d8a0374d3
|
Use literals in place of LLONG_MIN, LLONG_MAX ULLONG_MAX if they are not available. Amend 498c0dcb4c. We prefer using the defines if available in limits.h because they somehow tend to work without warnings when enabling strict C++03 compilation. The 3 literals are fallbacks.. (#1926).
|
6 years ago |
|
omar
|
8ef0ca9765
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
|
omar
|
87e2fea09d
|
Renamed io.OptResizeWindowsFromEdges to ConfigResizeWindowsFromEdges, io.OptCursorBlink to io.ConfigCursorBlink, io.OptMacOSXBehaviors to ConfigMacOSXBehaviors for consistency. (#1427, #1495, #822, #473, #650)
Demo: Exposed flags in Demo.
|
6 years ago |