|
|
835a8b2c9b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-05-10 22:56:43 +02:00 |
|
|
|
a4d0b0efa4
|
Internal: Refactored Separator into SeparatorEx(), exposed ImGuiSeparatorFlags_SpanAllColumns in imgui_internal.h and support without. (#759) + misc comments
|
2019-05-09 12:55:01 +02:00 |
|
|
|
d1d5075b66
|
Version 1.70
|
2019-05-06 14:17:39 +02:00 |
|
|
|
825b61e4ba
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
|
2019-05-02 14:56:47 +02:00 |
|
|
|
db2d58a68b
|
Drag and Drop: Fixed drag source with ImGuiDragDropFlags_SourceAllowNullID and null ID from receiving click regardless of being covered by another window (it didn't honor correct hovering rules). (#2521)
|
2019-04-29 16:34:02 +02:00 |
|
|
|
7e67aba286
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-29 13:06:55 +02:00 |
|
|
|
bda2cde68e
|
Popups: Closing a popup restores the focused/nav window in place at the time of the popup opening, instead of restoring the window that was in the window stack at the time of the OpenPopup call. (#2517)
Among other things, this allows opening a popup while no window are focused, and pressing Escape to clear the focus again.
|
2019-04-28 22:18:51 +02:00 |
|
|
|
dfb82d5c22
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_sdl.h
# imgui.cpp
|
2019-04-25 17:53:11 +02:00 |
|
|
|
0ca1675ff9
|
Internals: TempInputText: Rename InputScalarAsWidgetReplacement() -> TempInputTextScalar(), ScalarAsInputTextId -> TempInputTextId, small tidying up in affected functions.
|
2019-04-25 16:03:47 +02:00 |
|
|
|
6db0766564
|
Misc comments, internal renaming, added disable indentation option to Columns demo section.
|
2019-04-24 17:40:07 +02:00 |
|
|
|
03b64defa5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-04-19 19:52:45 +02:00 |
|
|
|
1f25cdd6b4
|
Clarified asserts comments + todo entries. (#2500)
|
2019-04-17 09:59:03 +02:00 |
|
|
|
b89202824e
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_sdl.cpp
|
2019-04-15 16:03:17 +02:00 |
|
|
|
c1848b185c
|
Examples: Emscripten: Switched to WebGL1/ES2, Added Changelog, Updated links, Added ignore list, Fixed warning with older versions. Removed reliance on C++11 (would warn on some compiler). Improved html template, removed undesirable options, reduced log size. Tweaked main.cpp. (#2494)
|
2019-04-15 01:28:44 +02:00 |
|
|
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
|
|
b53630813e
|
Internals: Tweak ItemSize calls. Added todo items.
|
2019-04-08 16:13:51 +02:00 |
|
|
|
49fb8e6c45
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl3.cpp
|
2019-04-03 11:17:26 +02:00 |
|
|
|
8dab7ac021
|
InputText: Made Shift+Tab consistently do nothing regardless of whether the back-end emits both char and keys or just keys. (#2467, #1336)
|
2019-04-03 11:14:34 +02:00 |
|
|
|
da035ced97
|
InputText, Examples/SDL: Emulate \t input if back-end doesn't provide it. (#1336, #2467)
+ Fix some output filename in SDL build batch files.
|
2019-04-03 11:04:00 +02:00 |
|
|
|
4a57507f75
|
InputText: Work-around for buggy standard libraries where isprint('\t') returns true. (#2467, #1336)
Not using isprint. + todo items.
|
2019-04-03 10:40:14 +02:00 |
|
|
|
9bf6509c6e
|
Docking: Fixed focus restore lagging by a frame when a tab stops being submitted. (#2109) Building on a little build of technical debt there, should transition toward a more general docking-agnostic system (#2304)
|
2019-03-28 18:43:27 +01:00 |
|
|
|
b6ae8a0dca
|
Docking: Disable SkipItems when directly/programmatically focused (possible generalization of code currently in BeginDocked which relies on tab bar interaction, will remove that code in next commit). (#2453, #2109)
|
2019-03-28 16:11:50 +01:00 |
|
|
|
a33d45d7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-03-28 15:48:25 +01:00 |
|
|
|
04a9ce3a18
|
Docking: Renamed ImGuiDockNodeFlags_PassthruDockspace to ImGuiDockNodeFlags_PassthruCentralNode. + Comments, shallow tweaks. (#2109)
|
2019-03-27 16:16:31 +01:00 |
|
|
|
20188b19d6
|
Comments (#2441) + Freeglut fixes (#2430)
|
2019-03-26 12:16:23 +01:00 |
|
|
|
9350158d61
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2019-03-25 16:08:09 +01:00 |
|
|
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
2019-03-17 00:56:21 +01:00 |
|
|
|
b1af4d36ce
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
|
2019-03-13 15:30:35 +01:00 |
|
|
|
55c02099c5
|
Version 1.69, comments, typos
|
2019-03-13 15:29:43 +01:00 |
|
|
|
f7db4fad31
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# imgui.cpp
|
2019-03-11 16:08:16 +01:00 |
|
|
|
b5d57a6615
|
Fix typos. (#2413)
|
2019-03-09 10:10:17 +01:00 |
|
|
|
e02d6014bf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-03-05 22:13:38 +01:00 |
|
|
|
1ed3c4cf4a
|
Internal: Text: Extracted TextUnformatted into TextEx over which we can freely atter the signature. Clarified current large text behavior of TextUnformatted with explicit ImGuiTextFlags_NoWidthForLargeClippedText flag (always set).
|
2019-03-05 17:35:45 +01:00 |
|
|
|
622a27506a
|
Text: Fixed large Text/TextUnformatted call not declaring its size when starting below the lower point of the current clipping rectangle. Somehow this bug has been there since v1.0! It was hardly noticeable but would affect the scrolling range, which in turn would affect some scrolling request functions when called during the opening frame of a window.
|
2019-03-05 15:23:11 +01:00 |
|
|
|
8915f7933a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-02-24 23:24:07 +01:00 |
|
|
|
cd67d4d3c1
|
Log/Capture: Fixed LogXXX functions 'auto_open_depth' parameter being treated as an absolute tree depth instead of a relative one. Fixed CollapsingHeader trailing ascii representation being "#" instead of "##". Minor tidying up the of code.
|
2019-02-23 16:07:01 +01:00 |
|
|
|
87ded34f9f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
|
2019-02-22 12:29:18 +01:00 |
|
|
|
782b747a17
|
InputText: Renamed some local variables to clarify code. Should be a no-op functionality wise. TODO items.
|
2019-02-20 00:45:45 +01:00 |
|
|
|
4a3a895be9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2019-02-06 14:47:53 +01:00 |
|
|
|
5bdc7d7a6f
|
Menus: Tweaked horizontal overlap between parent and child menu (to help convey relative depth) from using style.ItemSpacing.x to style.ItemInnerSpacing.x, the later being expected to be smaller. (#1086)
|
2019-02-06 12:32:10 +01:00 |
|
|
|
07ff47bf1b
|
Docking: Fixed various border / padding related inconsistency with dock node vs floating windows. (#2109)
|
2019-01-23 19:54:45 +01:00 |
|
|
|
0947fa3de0
|
Merge branch 'viewport' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-01-21 16:54:37 +01:00 |
|
|
|
cb9a6b8a8b
|
Merge branch 'master' into viewport
# Conflicts:
# examples/README.txt
# imgui.cpp
|
2019-01-21 16:52:22 +01:00 |
|
|
|
54ba8a643e
|
Removed trailing spaces from text files. (#2038, #2299)
|
2019-01-20 22:23:29 +01:00 |
|
|
|
b5144e477f
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-01-17 14:06:42 +01:00 |
|
|
|
e9c625a1dc
|
Merge branch 'master' into viewport
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
|
2019-01-17 14:05:40 +01:00 |
|
|
|
8cbb91261e
|
ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). (#2287) [@baktery]
+ Demo tweaks
|
2019-01-16 17:47:49 +01:00 |
|
|
|
515ad62335
|
Merge branch 'viewport' into docking
# Conflicts:
# docs/TODO.txt
|
2019-01-15 15:14:16 +01:00 |
|
|
|
73353fad64
|
Merge branch 'master' into viewport
|
2019-01-15 15:13:29 +01:00 |
|
|
|
d38d7c6628
|
TODO update + internals: changed order or ImGuiLayoutType enums to allow using them for indexing.
|
2019-01-15 15:06:24 +01:00 |
|
