ocornut
|
ea4565368e
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl2.cpp
# backends/imgui_impl_sdl2.h
# backends/imgui_impl_sdl3.cpp
# backends/imgui_impl_sdl3.h
# imgui.cpp
|
2023-02-10 17:05:06 +01:00 |
|
ocornut
|
99c0bd65df
|
Added SeparatorText() widget. (#1643)
|
2023-02-10 12:16:41 +01:00 |
|
ocornut
|
5386ddcd05
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_sdl.cpp
# examples/example_emscripten_opengl3/main.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_glut_opengl2/main.cpp
# examples/example_sdl_directx11/main.cpp
# examples/example_sdl_opengl2/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
# examples/example_win32_directx9/main.cpp
# imgui_demo.cpp
|
2023-02-02 18:31:26 +01:00 |
|
ocornut
|
ce6e6da510
|
Examples: Made example_sdl_opengl3 and example_glfw_opengl3 build with Emscripten. Removed dedicated examples. (#2492, #2494, #3699, #3705)
|
2023-02-02 18:08:17 +01:00 |
|
ocornut
|
887abe9578
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2023-02-01 22:18:57 +01:00 |
|
ocornut
|
3617a96372
|
Backends, Inputs: Made horizontal scroll wheel and horizontal scroll direction consistent accross backends/os. (#4019, #6096, #1463)
Documented assumptions.
|
2023-02-01 21:29:08 +01:00 |
|
nahkhiir
|
2efebe3315
|
ShowFontAtlas, Demo: optionally use style text color for tint. (#6129)
|
2023-01-31 18:12:42 +01:00 |
|
ocornut
|
259560aa26
|
Demo: moved sections around in prevision for adding nicer separators.
|
2023-01-27 19:05:33 +01:00 |
|
ocornut
|
88dfd85e92
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2023-01-21 00:49:06 +01:00 |
|
ocornut
|
482ac70a0b
|
Version 1.89.3 WIP
|
2023-01-11 15:52:30 +01:00 |
|
ocornut
|
d822c65317
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
|
2023-01-05 15:58:49 +01:00 |
|
ocornut
|
d7c8516a4b
|
Version 1.89.2
|
2023-01-05 15:49:29 +01:00 |
|
ocornut
|
e06bbe05e1
|
Revert most/part of "Shortcut: added Shortcut() function and ImGuiInputFlags in public API + Demo." (#456, #2637)
This reverts commit 0949acb6e6.
# Conflicts:
# imgui.h
|
2023-01-05 15:21:48 +01:00 |
|
ocornut
|
fc3815bfe5
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_vulkan.cpp
|
2023-01-03 21:06:09 +01:00 |
|
ocornut
|
156e0a8070
|
Demo: amend Selectable() + BeginPopupContextItem() demo to maintain and update selection state when popup is open. (#6032)
|
2023-01-02 18:01:57 +01:00 |
|
ocornut
|
c191faf0ba
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2022-12-08 21:19:01 +01:00 |
|
ocornut
|
317b33d647
|
Tables: fixed matching width of synchronized tables when only some (not all) instances have a vertical scrollbar. (#5920)
|
2022-12-08 20:06:26 +01:00 |
|
ocornut
|
0949acb6e6
|
Shortcut: added Shortcut() function and ImGuiInputFlags in public API + Demo. (#456, #2637)
|
2022-12-08 18:54:41 +01:00 |
|
ocornut
|
48215231f9
|
Demo: moved WantCapture overrides items + various comments related to ImGuiKey, ImGuiMod
|
2022-12-08 18:30:48 +01:00 |
|
ocornut
|
3ea0fad204
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
|
2022-12-01 20:22:27 +01:00 |
|
ocornut
|
45736443be
|
Debug Tools: Metrics: added "Inputs" section, moved from Demo for consistency.
|
2022-11-30 20:14:52 +01:00 |
|
ocornut
|
bd96f6eac4
|
Text: Fixed layouting of wrapped-text block when the last source line is above the clipping region. Regression added in 1.89. (#5720, #5919)
+ Update version marker
|
2022-11-28 14:59:13 +01:00 |
|
ocornut
|
595a428baa
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
|
2022-11-24 21:27:15 +01:00 |
|
ocornut
|
a8df192df0
|
Version 1.89.1
|
2022-11-24 21:24:33 +01:00 |
|
ocornut
|
38cfe22b8b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2022-11-16 17:57:05 +01:00 |
|
ocornut
|
5bb2874940
|
Version 1.89.1 WIP
|
2022-11-16 17:55:27 +01:00 |
|
ocornut
|
94e850fd6f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2022-11-15 15:40:54 +01:00 |
|
ocornut
|
81160fee56
|
Version 1.89
+ fix warning from a582d92
|
2022-11-15 15:20:36 +01:00 |
|
ocornut
|
7380b9816e
|
Scrolling: Exposed SetNextWindowScroll() in public API. (#1526)
|
2022-11-09 17:03:07 +01:00 |
|
ocornut
|
849c8052b7
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_osx.mm
# backends/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
|
2022-11-04 16:26:15 +01:00 |
|
ocornut
|
1eac0024c0
|
InputText: copy and select all shortcuts don't need repeat (tho it was harmless0
|
2022-11-03 18:33:43 +01:00 |
|
ocornut
|
375ae5dce4
|
Merge branch 'master' into docking (incl glfw use of GLFW_VERSION_COMBINED)
Note switched from GLFW_VERSION_REVISION * 10 to GLFW_VERSION_REVISION * 1
|
2022-10-24 22:58:25 +02:00 |
|
ocornut
|
e3fa56ae05
|
BeginMenu(): Menus: Fixed a one-frame issue where SetNextWindowXXX data are not consumed by a BeginMenu().
+ Shallow tweaks to reduce diff of future branches. Removing early return also facilitate some changes.
|
2022-10-19 14:12:04 +02:00 |
|
ocornut
|
d91211f9f2
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_opengl3.cpp
# backends/imgui_impl_win32.cpp
|
2022-09-29 22:02:23 +02:00 |
|
ocornut
|
5c4426c5b8
|
Demo: Fixed Log & Console from losing scrolling position with Auto-Scroll when child is clipped. (#5721)
|
2022-09-28 12:22:44 +02:00 |
|
ocornut
|
6fd2ee9416
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_sdl.cpp
# imgui_demo.cpp
|
2022-09-26 14:57:34 +02:00 |
|
ocornut
|
c261dac02f
|
Demo: moved ShowUserGuide() lower in the file, to make main demo entry point more visible + fix using IMGUI_DEBUG_LOG() macros in if/else.
|
2022-09-26 14:56:36 +02:00 |
|
ocornut
|
1dc7d0e633
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_glfw.cpp
# backends/imgui_impl_osx.mm
# backends/imgui_impl_sdl.cpp
# backends/imgui_impl_win32.cpp
# imgui.cpp
|
2022-09-26 11:08:49 +02:00 |
|
ocornut
|
85f327d8d3
|
InputText: added ImGuiInputTextFlags_EscapeClearsAll (#5688)
|
2022-09-21 16:23:44 +02:00 |
|
ocornut
|
4b522e145c
|
Experiment: ImGuiKey is now a typed enum, allowing ImGuiKey_XXX symbols to be named in debuggers. (#4921, #4537)
May affect binding generators.
|
2022-09-20 12:42:29 +02:00 |
|
ocornut
|
3af9ac320d
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_examples.sln
# imgui.cpp
# imgui.h
# imgui_demo.cpp
|
2022-09-17 00:25:42 +02:00 |
|
tocic
|
2b1d8e3eaf
|
Fix more typos in sources and docs (#5681)
|
2022-09-14 20:36:45 +02:00 |
|
ocornut
|
44e3ba115a
|
Demo: moved "Mouse Cursors" section. moved "Filtering" section.
|
2022-09-14 20:18:23 +02:00 |
|
tocic
|
6c3c9cea7f
|
Fix typos in source comments (#5675)
|
2022-09-13 11:09:34 +02:00 |
|
ocornut
|
bc2002ab92
|
Merge branch 'master' into docking
|
2022-09-01 20:54:37 +02:00 |
|
ocornut
|
2569c64740
|
Demo: Improved "Constrained-resizing window" example, more clearly showcase aspect-ratio. (#5627, #5618)
|
2022-09-01 11:13:39 +02:00 |
|
ocornut
|
e13913ed57
|
IsItemHovered: Added ImGuiHoveredFlags_DelayNormal, ImGuiHoveredFlags_DelayShort, ImGuiHoveredFlags_NoSharedDelay. (#1485)
IsItemHovered() can't have a non-zero default, but higher-level tooltip helpers may enable a different default later.
|
2022-08-24 21:32:13 +02:00 |
|
ocornut
|
db798fd5be
|
Merge branch 'master' into docking
# Conflicts:
# backends/imgui_impl_metal.mm
# imgui.cpp
# imgui_internal.h
|
2022-08-23 18:41:24 +02:00 |
|
ocornut
|
ef6ba0d846
|
Misc: allowing override of IM_TABSIZE (#5593)
|
2022-08-20 19:54:57 +02:00 |
|
ocornut
|
e9f50fb87c
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2022-08-03 22:04:03 +02:00 |
|