omar
|
2cff3f6a65
|
Docking: Renamed io.ConfigDockingWithKeyMode to io.ConfigDockingWithShift.
|
2018-10-01 18:35:21 +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
|
35d1fb7b34
|
Style: Added style.TabRounding setting.
|
2018-09-30 18:41:07 +02:00 |
|
omar
|
c6193d0605
|
Merge branch 'viewport' into docking
|
2018-09-26 21:35:09 +02:00 |
|
omar
|
6cc380fc41
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
|
2018-09-26 21:34:52 +02:00 |
|
omar
|
61d94ff88e
|
Renamed SetScrollHere() to SetScrollHereY(). Kept redirection function (will obsolete).
|
2018-09-26 21:30:37 +02:00 |
|
omar
|
d3e8e5731a
|
Docking: Renamed SetNextWindowDock() to SetNextWindowDockId(). Added GetWindowDockId().
|
2018-09-25 17:45:06 +02:00 |
|
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.
|
2018-09-20 10:24:29 +02:00 |
|
omar
|
3e47978a80
|
Docking: Renamed ImGuiDockSpaceFlags to ImGuiDockNodeFlags. Clarified in comments/demos that DockSpace creates a Node. Renamed IsExplicitRoot to IsDockSpace. Assert against explicitly calling DockSpace twice in a frame.
|
2018-09-20 09:52:51 +02:00 |
|
omar
|
291bfe6841
|
Docking: work to allow programmatic control of dock nodes, various refactor + assert fix. Probably broke something (but I haven't found what yet!)
|
2018-09-19 16:00:13 +02:00 |
|
omar
|
b55b9aee9b
|
Fixed bad merge (a82be53) where we lost the version number in Docking branch + moved Docking related API together for now.
|
2018-09-14 18:09:46 +02:00 |
|
omar
|
0f1c21a6c9
|
Docking: Changed DockSpace() signature to take an ID, as ID will frequently be used by other API it makes more sense to let the user compute it.
|
2018-09-14 18:09:04 +02:00 |
|
omar
|
e32256b4b4
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-14 11:38:10 +02:00 |
|
omar
|
df65d4a14f
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2018-09-11 11:18:46 +02:00 |
|
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)
|
2018-09-11 11:15:06 +02:00 |
|
omar
|
e2436ca625
|
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
|
2018-09-10 20:40:21 +02:00 |
|
omar
|
d5692bff00
|
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
|
2018-09-10 20:30:14 +02:00 |
|
omar
|
b872aa5c8e
|
Docking: io.ConfigResizeWindowsFromEdges default to true in Docking branch. Moved code in BeginTabItem().
|
2018-09-10 11:24:27 +02:00 |
|
omar
|
a82be53407
|
Merge branch 'docking2' into viewport_docking
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
|
2018-09-06 22:28:21 +02:00 |
|
omar
|
bd5b38e232
|
Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) (#351)
|
2018-09-06 21:45:46 +02:00 |
|
omar
|
58d46e1fe6
|
Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. (#261, #351)
|
2018-09-06 21:45:44 +02:00 |
|
omar
|
eb7033e75b
|
Version 1.66 WIP
|
2018-09-06 21:44:59 +02:00 |
|
omar
|
b974fffea0
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-09-06 15:59:35 +02:00 |
|
omar
|
e0cab5664a
|
Version 1.65
|
2018-09-06 15:58:58 +02:00 |
|
omar
|
a2616c79fe
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-09-06 11:42:11 +02:00 |
|
omar
|
e58bc3d5b7
|
Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. (#2036)
|
2018-09-06 11:36:00 +02:00 |
|
omar
|
8601c39571
|
Viewport: Making the code a little more sturdy (flag changes) + added descriptions. (#1542)
|
2018-09-05 17:50:55 +02:00 |
|
omar
|
af27ec296b
|
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-09-05 17:38:47 +02:00 |
|
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)
|
2018-09-05 17:33:00 +02:00 |
|
omar
|
77ba883f23
|
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout.
|
2018-09-05 17:29:47 +02:00 |
|
omar
|
bbcc976739
|
Demo: Added a "Configuration" block to make io.ConfigFlags/io.BackendFlags more prominent.
|
2018-09-05 17:29:47 +02:00 |
|
omar
|
a848807847
|
Minor inconsequential merges from Master/Docking branches
|
2018-09-05 11:51:45 +02:00 |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
2018-09-05 11:08:57 +02:00 |
|
omar
|
bcb1441ce7
|
Version 1.65 WIP
|
2018-09-03 14:38:04 +02:00 |
|
omar
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
2018-08-31 10:28:21 +02:00 |
|
omar
|
48db5713d6
|
Version 1.64
|
2018-08-31 10:00:03 +02:00 |
|
omar
|
6c34bffbb5
|
Version 1.64 WIP
|
2018-08-30 19:00:22 +02:00 |
|
omar
|
f2aa124eb8
|
Version 1.64 WIP
|
2018-08-30 14:25:23 +02:00 |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2018-08-29 17:40:52 +02:00 |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
2018-08-29 16:20:25 +02:00 |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-08-25 21:19:42 +02:00 |
|
omar
|
3612885dea
|
Comments, demo
|
2018-08-23 13:37:06 +02:00 |
|
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)
|
2018-08-23 13:26:14 +02:00 |
|
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)
|
2018-08-23 13:21:01 +02:00 |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2018-08-22 21:35:44 +02:00 |
|
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)
|
2018-08-22 13:25:08 +02:00 |
|
omar
|
8d639ec60d
|
InputText: callback InsertChars() support resize callbacks correctly (followup to 24ff259) + fixed demo to use those functions. (#2006, #1443, #1008).
|
2018-08-22 13:09:44 +02:00 |
|
omar
|
9f393c38e9
|
InputText: Renamed ImGuiTextEditCallback to ImGuiInputTextCallback, ImGuiTextEditCallbackData to ImGuiInputTextCallbackData for consistency. Kept redirection types (will obsolete).
|
2018-08-22 12:46:45 +02:00 |
|
omar
|
4de6e1f7e4
|
InputText: Internal renaming of some fields + final copy uses edit_state.CurLenA+1 instead of buf_size.
|
2018-08-21 15:14:10 +02:00 |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-08-13 17:50:48 -07:00 |
|