omar
|
e6cc547a94
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
|
2018-10-12 15:51:31 +02:00 |
|
omar
|
e73217d6f7
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2018-10-12 15:50:48 +02:00 |
|
omar
|
ca753829cb
|
Revert using wchar_t functions (9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
|
2018-10-12 15:48:38 +02:00 |
|
omar
|
28953208d4
|
Tests: Added imgui-test engine hooks (experimental).
|
2018-10-12 15:47:15 +02:00 |
|
omar
|
2eaf5b03df
|
Fixes crash introduced in previous commit 9cf94d5.
|
2018-10-12 13:30:00 +02:00 |
|
omar
|
ede3a3b92d
|
Fixes crash introduced in previous commit 9cf94d5.
|
2018-10-12 13:29:13 +02:00 |
|
omar
|
c398153b40
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
|
2018-10-12 13:01:20 +02:00 |
|
omar
|
33994bbfa1
|
Docking: Fixed Modal window from being dockable.
|
2018-10-12 12:56:56 +02:00 |
|
omar
|
9cf94d5dd6
|
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
|
2018-10-12 12:34:47 +02:00 |
|
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.
|
2018-10-12 11:16:51 +02:00 |
|
omar
|
74c0309126
|
InputText: Clarified comments around ImGuiInputTextFlags_CallbackResize and other callbacks. (#2006, #1443, #1008)
|
2018-10-12 10:34:58 +02:00 |
|
omar
|
ed4dcd9072
|
Shutdown: Unlock font atlas before destroying context, so we can destroy a context between NewFrame and EndFrame if we wait (facilitate main loop structures). Internals: GetWindowScrollMaxX(), GetWindowScrollMaxY()
|
2018-10-11 22:38:26 +02:00 |
|
omar
|
7525637804
|
Merge branch 'viewport' into docking. 15ec78e Fixes the update of title buffer when docked in a leaf dock node with a single window. Added comment about overwriting DockIsActive in DockNodeUpdate().
# Conflicts:
# imgui.cpp
|
2018-10-11 21:36:00 +02:00 |
|
omar
|
15ec78e9d8
|
Internal: Moved stored window name update code to the first_begin_of_the_frame block. This will be useful in the Docking branch.
|
2018-10-11 21:32:20 +02:00 |
|
omar
|
cf0afb48ac
|
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
|
2018-10-11 12:53:10 +02:00 |
|
omar
|
d02b11dfbd
|
ImGuiTextBuffer: Avoid heap allocation when empty.
|
2018-10-11 12:08:09 +02:00 |
|
omar
|
1efafa1d29
|
Comments + internal using Tab Stop terminology (ImGuiItemFlags_NoTabStop instead of !ImGuiItemFlags_AllowKeyboardFocus)
|
2018-10-10 12:09:06 +02:00 |
|
omar
|
3a7828de6b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
2018-10-09 18:35:45 +02:00 |
|
omar
|
7b3433c68b
|
Viewport: Added ImGuiConfigFlags_ViewportsDecoration to re-enable platform decoration (#1542)
|
2018-10-09 18:33:39 +02:00 |
|
omar
|
84507cc744
|
Docking: Kept ImGuiDockNodeFlags_PassthruDockspace and removed ImGuiDockNodeFlags_PassthruInEmptyNodes, ImGuiDockNodeFlags_RenderWindowBg. Doesn't include ImGuiDockNodeFlags_NoDockingInCentralNode. (#2109)
|
2018-10-08 12:37:10 +02:00 |
|
omar
|
3fcc178c23
|
Update README.md
|
2018-10-08 11:37:13 +02:00 |
|
omar
|
dd748f0e39
|
Update README.md
|
2018-10-08 11:22:33 +02:00 |
|
hesiod
|
500a60debc
|
Examples: OpenGL3: Cast compile/link status to GLboolean (#2112, #2125)
Some OpenGL loaders/bindings do not allow comparisons between GLints and GLbooleans.
|
2018-10-07 18:14:24 +02:00 |
|
omar
|
02afbaeef0
|
Examples: imgui_imp_opengl3.cpp explicit casting for overly aggressive glbinding compatibility. (#2112) [@hesiod]
|
2018-10-06 11:35:05 +02:00 |
|
omar
|
cb76c086e0
|
Docking: Removed context parameter from internal DockBuilderXXX api at it is expected we transition it to be public facing. (#2109)
|
2018-10-05 16:14:51 +02:00 |
|
omar
|
a3b0e0acfa
|
Examples: DirectX10, DirectX11: Removed seemingly unnecessary calls to invalidate and recreate device objects in the WM_SIZE handler. (#2088)
|
2018-10-05 11:36:49 +02:00 |
|
Michael Vetter
|
084c26aa41
|
Fix spacing in imgui_imp_sdl example (#2111)
|
2018-10-05 10:04:10 +02:00 |
|
omar
|
407822e6a5
|
BeginTabItem: Fixed missing parameter name in .h file messing up with cimgui generator. (#2115)
|
2018-10-04 19:39:02 +02:00 |
|
omar
|
3c427e284f
|
Update pull_request_template.md
|
2018-10-04 12:49:48 +02:00 |
|
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)
|
2018-10-03 22:32:23 +02:00 |
|
omar
|
2dd8338e7d
|
Docking: Added ImGuiDockNodeFlags_NoOuterBorder, tweaked DockSpace demo to remove window border. Made docking splitter use the same standard setting as resizing from edges. (#2109)
|
2018-10-03 18:30:36 +02:00 |
|
omar
|
059560d28b
|
ButtonBehavior, ImGuiButtonFlags_FlattenChildren flag can be used from a child window. Would typically affect calling SplitterBehavior() from a child window.
|
2018-10-03 18:11:35 +02:00 |
|
omar
|
d348d86df4
|
Docking: Renamed "DocRoot/DocumentRoot" to "CentralNode", more self explanatory. Moved Splitter update higher up in DockNodeUpdate() + minor misc tweak. (#2109)
|
2018-10-03 17:50:07 +02:00 |
|
omar
|
1d3862b6b3
|
Docking: Added ImGuiDockNodeFlags_NoDockingInsideDocRootNode flag. Honoring ImGuiDockNodeFlags_NoSplit in child node is already split (so we can use DockBuilder and then lock the layout). Added those options to the demo. (#2109)
|
2018-10-03 14:57:28 +02:00 |
|
omar
|
bd82539ad5
|
Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). (#2109)
|
2018-10-03 14:42:47 +02:00 |
|
omar
|
83f55c9de5
|
Merge branch 'viewport' into docking
|
2018-10-02 18:55:48 +02:00 |
|
omar
|
33b88a0339
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-10-02 18:55:36 +02:00 |
|
omar
|
fbfe193fcd
|
Window, Inputs: Fixed resizing from edges when io.MousePos is not pixel-rounded by rounding mouse position input. (#2110)
|
2018-10-02 18:49:55 +02:00 |
|
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)
|
2018-10-02 18:43:10 +02:00 |
|
omar
|
44bfa24cc3
|
Docking: Fixed crash using DockBuilderSplitNode(). (#2109)
|
2018-10-02 11:09:53 +02:00 |
|
omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
2018-10-01 18:35:21 +02:00 |
|
omar
|
76e31bd51a
|
Fixed typo. (#2108, #2083)
|
2018-10-01 17:56:06 +02:00 |
|
omar
|
e623be998d
|
Drag and Drop: Added GetDragDropPayload() to peek directly into the payload (if any) from anywhere. (#143)
|
2018-10-01 15:53:18 +02:00 |
|
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
|
2018-10-01 11:56:26 +02:00 |
|
omar
|
4e717b524c
|
Docking: Fixes for C++03 compilers.
|
2018-10-01 10:40:43 +02:00 |
|
omar
|
ae657a349a
|
Docking: Fixed extracting a dock node from a document root: document root should be preserved.
|
2018-09-30 23:39:38 +02:00 |
|
omar
|
ed3c015f4e
|
Docking: Reorganizing some of the tab-bar selection and window focus related code.
|
2018-09-30 23:39:38 +02:00 |
|
omar
|
9cfc40c2cc
|
Docking: Demo: Displaying a message if master docking flag is disabled. + DockSpace() early out + comments.
|
2018-09-30 23:39:37 +02:00 |
|
omar
|
6ebc63d3ef
|
Docking: Various sanity fixes + fixed tab-bar items sorting issue when docking single window with a dock node into single window without dock node.
|
2018-09-30 22:07:57 +02:00 |
|
omar
|
1ae0a1e658
|
Docking: Fix DockContextRebuild() temporarily invalidating dockid reference leading to undesirable merging of nodes.
|
2018-09-30 19:34:03 +02:00 |
|