omar
|
4a43f347bb
|
Merge branch 'viewport' into docking
# Conflicts:
# examples/example_allegro5/main.cpp
# examples/example_marmalade/main.cpp
|
6 years ago |
omar
|
dcbf976a8e
|
Merge branch 'master' into viewport + comments
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
6 years ago |
omar
|
aa668c410a
|
Nav: Fixed an assert in certain circumstance (mostly when using popups) when mouse positions stop being valid. (#2168) + adding a else block to make NavCalcPreferredRefPos() more explicit.
|
6 years ago |
omar
|
f52f0a5277
|
Examples: OpenGL3: Added support for GL 4.5's glClipControl(GL_UPPER_LEFT). (#2186)
|
6 years ago |
omar
|
5b1394c5ac
|
Update README.md
|
6 years ago |
omar
|
a3d6554e8e
|
Merge branch 'master' into viewport + specific changes for GLFW callbacks
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
|
6 years ago |
omar
|
772354377b
|
Examples: GLFW: User previously installed GLFW callbacks are now saved and chain-called by the default callbacks. (#1759)
|
6 years ago |
omar
|
a419d46205
|
Examples: OpenGL3+GLFW/SDL: Made main.cpp compile with IMGUI_IMPL_OPENGL_LOADER_CUSTOM (may be missing init). (#2178)
|
6 years ago |
omar
|
565af90958
|
Merge branch 'viewport' into docking
|
6 years ago |
omar
|
52ca91ca57
|
Merge branch 'master' into viewport
|
6 years ago |
omar
|
eb592bf7d3
|
ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. (#2173). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing.
|
6 years ago |
omar
|
7fa3e71abb
|
Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155)
|
6 years ago |
omar
|
168af9b377
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui_demo.cpp
|
6 years ago |
omar
|
50f6e12d31
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
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 |
Konstantin Podsvirov
|
faecf90383
|
SliderAngle: Added optional `format` argument to allow users customize precision and make localization. (#2150)
|
6 years ago |
omar
|
12c72d2893
|
Fixed OpenGL texture loading example in comment + Discourse link to root of discourse
|
6 years ago |
omar
|
a72d5ada61
|
Misc comments improvements
|
6 years ago |
omar
|
5f8c9ae0ef
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
omar
|
056af2b1af
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
omar
|
82873c7ad4
|
Update README.md
|
6 years ago |
omar
|
5be915d6ab
|
Added ImGuiWindowFlags_NoMouseInputs which is basically the old ImGuiWindowFlags_NoInputs (essentially we have renamed ImGuiWindowFlags_NoInputs to ImGuiWindowFlags_NoMouseInputs). Made the new ImGuiWindowFlags_NoInputs encompass both NoMouseInputs+NoNav, which is consistent with its description. (#1660, #787)
|
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
|
8b956216b7
|
Demo: Testing return value of BeginTabBar() for consistency.
|
6 years ago |
omar
|
b039dbc62e
|
Update README.md
|
6 years ago |
omar
|
e6cc547a94
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
6 years ago |
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
6 years ago |
omar
|
ca753829cb
|
Revert using wchar_t functions (9cf94d5 + 2eaf5b0 ). Big mistake, wchar_t is not guaranteed to be 16-bits.
|
6 years ago |
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
6 years ago |
omar
|
9cf94d5dd6
|
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
|
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
|
cf0afb48ac
|
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
|
6 years ago |
omar
|
d02b11dfbd
|
ImGuiTextBuffer: Avoid heap allocation when empty.
|
6 years ago |
omar
|
3a7828de6b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
6 years ago |
omar
|
7b3433c68b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
6 years ago |
omar
|
84507cc744
|
Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)
|
6 years ago |
omar
|
3fcc178c23
|
Update README.md
|
6 years ago |
omar
|
dd748f0e39
|
Update README.md
|
6 years ago |
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
6 years ago |
omar
|
4e30698706
|
Docking: Added ImGuiDockNodeFlags_PassthruDockspace mode (subdivided in three flags: ImGuiDockNodeFlags_NoDockingInCentralNode, ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg). Added internal facility for register a rectangular hit-test hole in window. Updated DockSpace demo accordingly. (#2109)
|
6 years ago |
omar
|
d348d86df4
|
Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109)
|
6 years ago |
omar
|
bd82539ad5
|
Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109)
|
6 years ago |
omar
|
83f55c9de5
|
Merge branch 'viewport' into docking
|
6 years ago |
omar
|
33b88a0339
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
6 years ago |
omar
|
fbfe193fcd
|
Window, Inputs: Fixed resizing from edges when io.MousePos is not pixel-rounded by rounding mouse position input. (#2110)
|
6 years ago |
omar
|
ae7f833c69
|
Window: Resizing from edges (with io.ConfigResizeWindowsFromEdges Beta flag) extends the hit region of root floating windows outside the window, making it easier to resize windows. Resize grips are also extended accordingly so there are no discontinuity when hovering between borders and corners. (#1495, #822, #2110)
|
6 years ago |
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
6 years ago |
omar
|
76e31bd51a
|
Fixed typo. (#2108, #2083)
|
6 years ago |
omar
|
e623be998d
|
Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. (#143)
|
6 years ago |
omar
|
b48ed9ebc0
|
Docking: Better tracking of current dock id for inactive and uncreated windows (in settings etc.). + Fixed assert when docking a single-visible leaf node of a hierarchy into another
|
6 years ago |