ocornut
|
9298e310b2
|
Merge branch 'master' into docking (note: won't build as-is, see next commit)
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2023-11-02 18:05:43 +01:00 |
|
ocornut
|
9235352400
|
BeginChild: Added ImGuiChildFlags_ResizeX and ImGuiChildFlags_ResizeY. (#1710)
|
2023-11-02 17:34:49 +01:00 |
|
ocornut
|
7713c29258
|
BeginChild: Upgraded 'bool border = true' parameter to use a ImGuiChildFlags type and the ImGuiChildFlags_Border value. (toward #1666, #1496, #1395, #1710)
|
2023-11-02 17:26:05 +01:00 |
|
ocornut
|
2a6d7b1eaa
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2023-10-18 19:45:19 +02:00 |
|
ocornut
|
56f7e853be
|
Demo: expose more Combo flags + misc tidying up.
|
2023-10-18 17:48:33 +02:00 |
|
ocornut
|
12a3c77c2f
|
Demo: Minor tweak to angled headers demo.
|
2023-10-12 20:00:34 +02:00 |
|
ocornut
|
83c4336828
|
Tables: fixed angled headers with frozen columns.
|
2023-10-12 19:48:29 +02:00 |
|
ocornut
|
f96c5443b1
|
Tables: fixed angled headers with frozen columns.
|
2023-10-12 19:47:58 +02:00 |
|
ocornut
|
f7fc186408
|
Merge branch 'master' into docking
+ 2 comments
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_win32.cpp
|
2023-10-12 19:22:36 +02:00 |
|
ocornut
|
32228d8add
|
Tables: added Angled headers support. Added ImGuiTableColumnFlags_AngledHeader, ImGui::TableHeadersAngledRow(), style.TableAngledHeadersAngle. (#2957)
|
2023-10-12 19:21:02 +02:00 |
|
ocornut
|
9f851ebfe4
|
Tables: added ImGuiTableFlags_HighlightHoveredColumn.
|
2023-10-12 19:15:17 +02:00 |
|
ocornut
|
feddcf3030
|
Combo: amends for ImGuiComboFlags_WidthFitPreview. (#6881)
Amend 112d8fc
|
2023-10-09 11:34:05 +02:00 |
|
mpv-enjoyer
|
112d8fc41d
|
Combo: added ImGuiComboFlags_WidthFitPreview. (#6881)
|
2023-10-09 11:26:00 +02:00 |
|
ocornut
|
72ebd91567
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# imgui.h
|
2023-10-05 15:10:45 +02:00 |
|
ocornut
|
2c07d581de
|
TreeNode: Added ImGuiTreeNodeFlags_SpanAllColumns for use in tables. (#3151, #3565, #2451, #2438)
|
2023-10-05 15:05:58 +02:00 |
|
ocornut
|
085ed7bfbe
|
Drag and Drop: Rework drop target highlight. (#4281, #3272)
Amend 4ddb6b46 , 4b94738c7
|
2023-10-05 14:13:27 +02:00 |
|
ocornut
|
a63e2f0a33
|
Drag and Drop: Fixed submitting a tooltip from drop target location. Added demo.
Amend 7bbf8f2 , 92b7d6b .
|
2023-10-05 12:06:40 +02:00 |
|
ocornut
|
f8aed6499f
|
Debug Tools: Rename ShowIdStackToolWindow() -> ShowIDStackToolWindow(). (#4631)
Squashed of 2 master commits.
|
2023-09-28 20:16:13 +02:00 |
|
ocornut
|
c21278eeae
|
Debug Tools: Rename ShowIdStackToolWindow() -> ShowIDStackToolWindow(). (#4631)
Amend 8175a47
|
2023-09-27 19:49:12 +02:00 |
|
ocornut
|
b7c250925f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-27 18:21:39 +02:00 |
|
ocornut
|
8175a47881
|
Debug Tools: Renamed ShowStackToolWindow() ("Stack Tool") to ShowIdStackToolWindow() ("ID Stack Tool"). (#4631)
|
2023-09-26 15:21:55 +02:00 |
|
ocornut
|
bb2fb74645
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2023-09-26 11:42:49 +02:00 |
|
Glordim
|
f4790f6f66
|
BeginItemTooltip: Rename flag in comment (#6853)
|
2023-09-22 17:52:50 +02:00 |
|
ocornut
|
ef8ff1b5d8
|
TabBar, Style: added style.TabBarBorderSize and associated ImGuiStyleVar_TabBarBorderSize. (#6820, #4859, #5022, #5239)
Cherry-picked from docking's 64b1e44
|
2023-09-18 15:29:42 +02:00 |
|
ocornut
|
64b1e448d2
|
TabBar, Style: added style.TabBarBorderSize and associated ImGuiStyleVar_TabBarBorderSize. (#6820, #4859, #5022, #5239)
Removed ImGuiTabItemFlags_Preview. Will need cherry-picking in master.
|
2023-09-18 15:28:44 +02:00 |
|
ocornut
|
afd0d3fca1
|
Docking: made ImGuiDockNodeFlags_NoUndocking public. (#2999, #6823, #6780, #3492)
Amend 1612813 .
|
2023-09-18 12:41:18 +02:00 |
|
ocornut
|
72d760ba00
|
Docking: (Breaking) renamed ImGuiDockNodeFlags_NoDockingInCentralNode -> ImGuiDockNodeFlags_NoDockingOverCentralNode, ImGuiDockNodeFlags_NoSplit -> ImGuiDockNodeFlags_NoDockingSplit.
Shuffled other internal flags and added comments.
|
2023-09-18 12:27:29 +02:00 |
|
ocornut
|
7e246a7bb9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2023-09-16 13:51:51 +02:00 |
|
ocornut
|
14f8b76c1a
|
Docking: Comments. Removed misleading shared/local identicators. (#6823, #2999)
NoDocking not marked as saved (it never was). Removed unused ImGuiDockNodeFlags_LocalFlagsMask_.
|
2023-09-15 20:44:15 +02:00 |
|
ocornut
|
b101cf46b6
|
ListBox, Combo: Changed signature of "name getter" callback in old one-liner ListBox()/Combo() apis.
|
2023-09-15 18:43:04 +02:00 |
|
ocornut
|
9714594c35
|
Tooltips: made using SetItemTooltip()/IsItemHovered(ImGuiHoveredFlags_ForTooltip) defaults to activate tooltips on disabled items.. (#1485)
|
2023-09-12 11:55:34 +02:00 |
|
ocornut
|
357f752bed
|
Docs: add more links to the top of every examples and backends files.
|
2023-09-11 14:01:40 +02:00 |
|
ocornut
|
72dbe45adc
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2023-09-08 18:02:06 +02:00 |
|
Leonardo Serrano
|
e3d9b875c9
|
ImDrawList: added PathEllipticalArcTo(), AddEllipse(), AddEllipseFilled(). (#2743)
Rebased with mods by ocornut: defaults to num_segments==0, supports for auto-tesselation, tweak demo.
|
2023-09-07 12:12:21 +02:00 |
|
ocornut
|
fb9b006865
|
Version 1.90 WIP
|
2023-09-05 16:46:52 +02:00 |
|
ocornut
|
c6e0284ac5
|
Fixed minor warning.
|
2023-09-04 15:16:55 +02:00 |
|
ocornut
|
1d8e48c161
|
Using range-based for where it makes sense. (#4537)
Amend 82d177c
|
2023-09-04 15:13:12 +02:00 |
|
ocornut
|
a1b60fc1f5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2023-09-04 14:59:59 +02:00 |
|
ocornut
|
fef3389157
|
Version 1.89.9
|
2023-09-04 14:30:32 +02:00 |
|
ocornut
|
e8a5c9e1b8
|
Tables: Made it possible to change style.CellPadding.y between rows. Added demo.
|
2023-09-04 11:23:54 +02:00 |
|
ocornut
|
8c497793f9
|
Demo: Tweak table sorting demo code.
|
2023-09-01 14:54:42 +02:00 |
|
ocornut
|
bdd9b96fa3
|
Demo: Reorganized "Examples" menu. Tweak Property Editor.
|
2023-08-31 20:04:43 +02:00 |
|
ocornut
|
82d177ccbd
|
Using range-based for where it makes sense. (#4537)
|
2023-08-28 12:21:44 +02:00 |
|
ocornut
|
676497fe05
|
Merge branch 'master' into docking
ac64b65 on master seemed incorrect.
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2023-08-25 14:20:51 +02:00 |
|
ocornut
|
983b95bc87
|
Demo: tweak explanation about static keyword. (#6718)
|
2023-08-14 16:55:03 +02:00 |
|
ocornut
|
8f5ce73140
|
Tables: Made it possible to use SameLine(0,0) after TableNextColumn() or TableSetColumnIndex() in order to reuse line height from previous cell.
|
2023-08-14 13:09:39 +02:00 |
|
ocornut
|
63b6300c39
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2023-08-08 14:16:13 +02:00 |
|
ocornut
|
edebb90a9a
|
Demo: amend/fix for MinGW
Amend 4d6fbaf .
|
2023-08-07 18:27:28 +02:00 |
|
ocornut
|
4d6fbaff11
|
Demo: define standard PRI names we use (if missing) instead of defininig IM_PRId64, IM_PRIu64.
|
2023-08-07 15:24:31 +02:00 |
|
ocornut
|
2b1fc6f765
|
Demo: Demonstrate out-of-order rendering using ImDrawListSplitter.
|
2023-08-06 20:13:05 +02:00 |
|