ocornut
|
fa004ae79a
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_examples.sln
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
# imgui_widgets.cpp
|
2020-09-22 17:00:57 +02:00 |
|
ocornut
|
1ec464eb9a
|
Tab Bar: Further simplification of section/clip rect handling. (#3291)
|
2020-09-22 16:43:40 +02:00 |
|
ocornut
|
6b76781c66
|
Tab Bar: Tidying up. Rework ShrinkWidths to allow marking tabs as not shrinkable (unused yet) + don't unnecessarily move data within ShrinkWidthBuffer. (#3291)
|
2020-09-22 16:43:39 +02:00 |
|
Louis Schnellbach
|
99f69eb185
|
Tab Bar: Moved up TabBarScrollingButtons function call. (#3291)
|
2020-09-22 16:43:39 +02:00 |
|
ocornut
|
205874f5b1
|
Tab Bar: Fix reorderable tab bars. Fix misleading use of tab_max_width in TabBarLayout(). Misc amends, shortening. (#3291)
|
2020-09-22 16:43:39 +02:00 |
|
Louis Schnellbach
|
3422cb1308
|
Tab Bar: Various fixes. Tried to reduce code complexity. (#3291)
|
2020-09-22 16:43:39 +02:00 |
|
ocornut
|
5e5f25e2dd
|
Tab Bar: Rename named sections members into array. Various tidying up. (#3291)
|
2020-09-22 16:43:39 +02:00 |
|
Louis Schnellbach
|
7ac16c02cc
|
Tab Bar: Fix multiple width and position computation issue. (#3291)
|
2020-09-22 16:43:38 +02:00 |
|
ocornut
|
f23c39c395
|
Tab Bar: Fixed handling of scrolling policy with leading/trailing tabs. + warning fixes + bunch of renaming. (#3291)
Demo tweaks.
|
2020-09-22 16:43:38 +02:00 |
|
Louis Schnellbach
|
4a57a982be
|
Tab Bar: Added TabItemButton(), ImGuiTabItemFlags_Leading, ImGuiTabItemFlags_Trailing + demo. (#3291)
(squashed various commits by 2 authors)
|
2020-09-22 16:43:38 +02:00 |
|
ocornut
|
29836412e1
|
Internals, CollapsingHeader, TabItem: Standardized using a #CLOSE id prefix for TabItem and ColllapsingHeader (same as window)
|
2020-09-22 15:49:47 +02:00 |
|
ocornut
|
27d0c3afa9
|
Tab Bar: Fixed a small bug where scrolling buttons (with ImGuiTabBarFlags_FittingPolicyScroll) would generate an unnecessary extra draw call.
|
2020-09-21 20:00:25 +02:00 |
|
ocornut
|
afc1099fb5
|
Tab Bar: Fixed a small bug where closing a tab that is not selected would leave a tab hole for a frame.
|
2020-09-21 18:52:20 +02:00 |
|
ocornut
|
a58a727781
|
Renamed OpenPopupContextItem() back to OpenPopupOnItemClick(), reverting 99ab5210
|
2020-09-21 14:45:35 +02:00 |
|
Louis Schnellbach
|
ec945f44b5
|
InputText: Added support for Page Up/Down in InputTextMultiline. (#3430)
+ fix stb_textedit.h to build with C language (amend fbf70070 )
|
2020-09-18 14:15:17 +02:00 |
|
ocornut
|
c206a19373
|
Removed ImFont::DisplayOffset in favor of ImFontConfig::GlyphOffset. (#1619)
+ Fonts: AddFontDefault() adjust its vertical offset based on floor(size/13) instead of always +1.
|
2020-09-17 16:45:21 +02:00 |
|
ocornut
|
645a6e0342
|
Bypass unnecessary formatting when using the TextColored()/TextWrapped()/TextDisabled() helpers with a "%s" format string. (#3466)
|
2020-09-16 18:36:42 +02:00 |
|
Bartosz Szreder
|
d2939ce0a1
|
Columns: Make sure the ClipRect is valid. (#3475)
|
2020-09-16 16:52:57 +02:00 |
|
omar
|
78f753ffff
|
Merge branch 'master' into docking + incl add wd->Pipeline in ImGui_ImplVulkan_RenderDrawData platform code (#3455, #3459)
|
2020-09-08 17:02:58 +02:00 |
|
omar
|
206d78a524
|
InputText: Fixed minor glitch when erasing trailing lines in InputTextMultiline(). Fixed cursor being partially covered after using Ctrl+End key.
Removed unncessary one-empty-line-worth-of-scrolling.
|
2020-09-08 11:42:13 +02:00 |
|
omar
|
36af398056
|
Sliders: Fixed using ImGuiSliderFlags_ClampOnInput with reverse sliders. (#3432, #3449)
|
2020-09-07 19:52:11 +02:00 |
|
Rokas Kupstys
|
b2039aac67
|
Slider: Fixed to reach maximum value with inverted integer min/max ranges, both with signed and unsigned types. Added reverse Sliders to Demo. (#3432, #3449)
|
2020-09-07 17:57:23 +02:00 |
|
ocornut
|
751d153ca9
|
InputText: Fixed callback's helper DeleteChars() function when cursor is inside the deleted block. (#3454).
|
2020-09-03 19:09:57 +02:00 |
|
ocornut
|
8dacb4da20
|
Docking: Fixed DockNode tab bar initial order broken by 8c80d533d
|
2020-09-02 12:11:45 +02:00 |
|
ocornut
|
34077c0140
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2020-09-01 12:07:35 +02:00 |
|
ocornut
|
ce230fc370
|
Internals: TabBar renaming and shuffling stuff around.
+ sneaking a readme change
|
2020-08-31 17:49:18 +02:00 |
|
ocornut
|
13f718337a
|
Internals: Added support for overriding locale decimal point, undocumented. (#2278) + Misc doc update.
Doc: Mention IMGUI_VERSION_NUM in recent api breaking changes + textwrap some demo code.
|
2020-08-28 18:38:31 +02:00 |
|
ocornut
|
093afd4f7f
|
Internals: Added Name to ImGuiDataTypeInfo + minor misc comments in BeginGroup().
|
2020-08-26 21:00:43 +02:00 |
|
Louis Schnellbach
|
8c80d533d9
|
Tab Bar: Fixed a small bug where toggling a tab bar from Reorderable to not Reorderable would leave tabs reordered in the tab list popup.
|
2020-08-26 16:36:57 +02:00 |
|
ocornut
|
32be6c064b
|
InputText: Fixed using ImGuiInputTextFlags_Password with InputTextMultiline(). (#3427, #3428)
|
2020-08-25 20:08:24 +02:00 |
|
ocornut
|
e9053515bb
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
|
2020-08-25 19:29:06 +02:00 |
|
ocornut
|
5919a6fa89
|
Tab Bar: Keep tab item close button visible while dragging a tab (independent of hovering state).
Improve 08108cf
|
2020-08-25 19:28:29 +02:00 |
|
ocornut
|
08108cf9ee
|
Tab Bar: Hide tab item close button while dragging a tab.
|
2020-08-25 16:48:31 +02:00 |
|
omar
|
2e50d0706b
|
Selectable: Tweaks. Added internal ImGuiSelectableFlags_NoPadWithHalfSpacing.
|
2020-08-24 16:31:00 +02:00 |
|
ocornut
|
7b0570d6ba
|
Revert "Drags, Sliders: internal ReadOnly flag gets forwarded properly to temp InputText()."
This reverts commit 640d1f60ce140e4c2bf858ac2f2e8a96d432e6a4.
|
2020-08-21 20:15:07 +02:00 |
|
ocornut
|
fdf952108d
|
Drags, Sliders: internal ReadOnly flag gets forwarded properly to temp InputText().
|
2020-08-21 19:17:44 +02:00 |
|
ocornut
|
ad8fdc917f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2020-08-20 22:42:14 +02:00 |
|
ocornut
|
9b50e691ed
|
TreeNode: Made clicking on arrow toggle toggle the open state on the Mouse Down event. Amend 05420ea2c .
|
2020-08-20 22:38:00 +02:00 |
|
ocornut
|
9262609eaf
|
Version 1.79 WIP
|
2020-08-20 16:46:44 +02:00 |
|
ocornut
|
05a25e5f36
|
BeginMenuBar: Fixed minor bug where CursorPosMax gets pushed to CursorPos prior to calling BeginMenuBar(), so e.g. calling the function at the end of a window would often add +ItemSpacing.y to scrolling range.
|
2020-08-20 16:24:54 +02:00 |
|
ocornut
|
fc9ccad6b9
|
InputText: Add ImGuiInputTextFlags_CallbackEdit, selection helpers in ImGuiInputTextCallbackData(). Add simple InputText() callbacks demo.
|
2020-08-20 11:25:39 +02:00 |
|
ocornut
|
4c201994d4
|
DragFloat, DragScalar: Fixed ImGuiSliderFlags_ClampOnInput not being honored in the special case where v_min == v_max. (#3361)
|
2020-08-20 11:21:15 +02:00 |
|
ocornut
|
05bc204dbd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
|
2020-08-18 17:51:43 +02:00 |
|
ocornut
|
95c99aaa4b
|
Version 1.78
|
2020-08-18 17:50:45 +02:00 |
|
ocornut
|
c6b01e8e1d
|
Drag, Sliders: Merged ImGuiDragFlags back into ImGuiSliderFlags. (#3361, #1823, #1316, #642, #1829, #3209)
Technically API breaking (but ImGuiDragFlags were pushed on master 16 hours ago)
|
2020-08-18 17:02:58 +02:00 |
|
ocornut
|
25a9209b75
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2020-08-17 23:29:17 +02:00 |
|
omar
|
f32663b33c
|
Drags, Sliders: Removed locking behavior with min > max (added in 1.73)
|
2020-08-17 22:10:42 +02:00 |
|
omar
|
7f8f0096d8
|
Internals: Renamed SliderCalcRatioFromValueT() -> ScaleRatioFromValueT(), SliderCalcValueFromRatioT() -> ScaleValueFromRatioT().
Replaced drag/slider flags with a single bool is_logarithmic in those functions.
|
2020-08-17 22:10:42 +02:00 |
|
omar
|
fb0f2ebd41
|
Drags, Sliders: Tweaks.
|
2020-08-17 22:10:42 +02:00 |
|
Ben Carter
|
fa279a6aa0
|
Drags, Sliders: Added deadzone to make selecting 0.0 on linear sliders easier, slider navigation delta accumulation. (#3361, #1823, #1316, #642)
|
2020-08-17 22:10:42 +02:00 |
|
omar
|
f75b29e7be
|
Drags, Sliders: Added ImGuiDragFlags_NoInput/ImGuiSliderFlags_NoInput to disable turning widget into a text input with CTRL+Click or Nav Enter.
|
2020-08-17 22:10:42 +02:00 |
|
omar
|
8018623c5b
|
Drags, Sliders: Added ImGuiDragFlags_NoRoundToFormat / ImGuiSliderFlags_NoRoundToFormat flags (#642)
|
2020-08-17 22:10:41 +02:00 |
|
omar
|
170d02bd99
|
Drags, Sliders: Added ImGuiDragFlags_ClampOnInput/ImGuiSliderFlags_ClampOnInput flags to force clamping value when using CTRL+Click to type in a value manually. (#1829, #3209)
|
2020-08-17 22:10:41 +02:00 |
|
omar
|
7607aea018
|
Drags, Sliders: Removed power features. Old entry points will pass-through if power=1.0f, otherwise assert + safe fallback. Remove 3 redirection functions (#3361, #1823, #1316, #642)
|
2020-08-17 22:10:41 +02:00 |
|
omar
|
43c099f31e
|
Drags, Sliders: Logarithmic: Moved flags to internals, allowing 1.0f to pass by. (#3361, #1823, #1316, #642)
|
2020-08-17 22:10:41 +02:00 |
|
omar
|
152dae9e2a
|
Drags, Sliders: Logarithmic: Split back flags into drag/slider flags. Moved to an obsolete section. (#3361, #1823, #1316, #642)
|
2020-08-17 22:10:40 +02:00 |
|
Ben Carter
|
9f98b4e7f2
|
Drags, Sliders: Logarithmic: Added logarithmic mode support to drag widgets, extended API to add flags to drag/sliders (#3361, #1823, #1316, #642)
|
2020-08-17 22:10:40 +02:00 |
|
Ben Carter
|
a252a287bf
|
Drags, Sliders: Logarithmic: WIP experiments with trying to make logarithmic sliders sensible (#3361, #1823, #1316, #642)
|
2020-08-17 22:10:40 +02:00 |
|
ocornut
|
46d75202b8
|
Tab Bar: Allow calling SetTabItemClosed() after a tab has been submitted (will process next frame).
+ larger combo height on TabBarTabListPopupButton()
|
2020-08-17 12:57:47 +02:00 |
|
omar
|
a5ba26806f
|
Make moving window prevent its active id from being stolen (#3392, #3243, #1738)
Amend 7b3d379 , 615e9ae3
|
2020-08-10 16:28:46 +02:00 |
|
omar
|
2c13a74a9d
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
|
2020-08-10 11:35:51 +02:00 |
|
omar
|
89ac87cd91
|
Internals: Added SetLastItemData, rename ImGuiItemHoveredDataBackup to ImGuiLastItemDataBackup.
|
2020-08-10 11:31:55 +02:00 |
|
omar
|
b15b25bccd
|
TabBar: made a change to that declared ideal width (for auto-resize) won't lag by an extra frame.
Vaguely relate to underlying (uncommited) work for #3291
|
2020-08-06 16:35:29 +02:00 |
|
omar
|
8074b49148
|
Selectable: Fixed highlight/hit extent when used with horizontal scrolling (in or outside columns). (#3187, #3386)
# Conflicts:
# imgui_widgets.cpp
|
2020-08-05 19:24:07 +02:00 |
|
omar
|
963839373c
|
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
|
2020-08-03 21:31:42 +02:00 |
|
omar
|
de1588928b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-08-03 19:54:31 +02:00 |
|
omar
|
4929a8e4a5
|
InvisibleButton: Made public a small selection of ImGuiButtonFlags (previously in imgui_internal.h) and allowed to pass them to InvisibleButton().
|
2020-08-03 18:45:30 +02:00 |
|
omar
|
a876ad877d
|
Window: Fixed clicking over an item which hovering has been disabled (e.g inhibited by a popup) from marking the window as moved.
+ comments
|
2020-08-03 18:05:20 +02:00 |
|
omar
|
70fa37527d
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
|
2020-07-29 15:15:14 +02:00 |
|
omar
|
bbd061538c
|
Internals: Drag/Sliders: simplified some code.
|
2020-07-24 13:00:56 +02:00 |
|
omar
|
b8c22bdb28
|
DragFloatRange2, DragIntRange2: Fixed an issue allowing to drag out of bounds when both min and max value are on the same value. (#1441)
|
2020-07-23 19:05:18 +02:00 |
|
omar
|
fdc526e8f8
|
Stop advertisting for Drag v_min>v_max which was introduced in 1.73 likely for 0537ac00 then made unnecessary with 32c33c66 , added undocumented ImGuiItemFlags_ReadOnly as possible replacement (unused), (#211)
|
2020-07-23 18:19:11 +02:00 |
|
omar
|
f79f0e42f7
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
|
2020-07-14 18:38:47 +02:00 |
|
omar
|
ab4ef822f0
|
Version 1.78 WIP
|
2020-06-30 16:56:09 +02:00 |
|
omar
|
90ea7e2f2f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-06-30 16:43:16 +02:00 |
|
Rokas Kupstys
|
0738611559
|
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
|
2020-06-30 16:37:21 +02:00 |
|
omar
|
ddabfc3477
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2020-06-29 17:15:40 +02:00 |
|
omar
|
9418dcb693
|
Version 1.77
+ fix minor clang-tidy warnings which seems reasonable
|
2020-06-29 15:54:28 +02:00 |
|
omar
|
5628416bd3
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2020-06-25 14:03:40 +02:00 |
|
omar
|
fed80b9537
|
Popups: Changed 'int mouse_buttons' to ImGuiPopupFlags. Added ImGuiPopupFlags_NoOpenOverExistingPopup, ImGuiPopupFlags_NoOpenOverItems. Refactored signature of BeginPopupContextWindow().
|
2020-06-23 20:05:15 +02:00 |
|
omar
|
5acf6d861a
|
Popups: Added ImGuiPopupFlags type, ImGuiPopupFlags_AnyPopupId and ImGuiPopupFlags_AnyPopupLevel flags for IsPopupOpen().
# Conflicts:
# docs/CHANGELOG.txt
|
2020-06-23 20:00:32 +02:00 |
|
omar
|
e0ec69d84b
|
Internals: Added ImageButtonEx() helper to temporarily bypass ID issues (#2464, #1390)
|
2020-06-23 15:47:07 +02:00 |
|
omar
|
20d61f5f62
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-20 22:06:01 +02:00 |
|
omar
|
8ead38c100
|
Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.
|
2020-06-18 17:02:24 +02:00 |
|
omar
|
704723744e
|
Disabled latest overzealous warnings from Clang
|
2020-06-18 16:19:51 +02:00 |
|
Louis Schnellbach
|
b1d8309abc
|
Added ImGuiTabItemFlags_NoTooltip for individual Tab Item.
|
2020-06-18 15:55:10 +02:00 |
|
ocornut
|
99ab521024
|
Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point
|
2020-06-15 22:12:38 +02:00 |
|
ocornut
|
c658cba22b
|
Comments, reworded some !(xxx && xxx) complex expression to be a little less confusing.
|
2020-06-15 18:06:48 +02:00 |
|
omar
|
90c0c0c163
|
Columns: Lower overhead on column switches and switching to background channel. (second attempt for 9b3ce49 )
Internals: Bits, comments, added ImRect::ToVec4()
|
2020-06-13 18:04:50 +02:00 |
|
ocornut
|
16da8e6da6
|
Revert "Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125)"
This reverts commit 9b3ce494fd .
|
2020-06-10 17:54:19 +02:00 |
|
ocornut
|
9b3ce494fd
|
Columns: Lower overhead on column switches and switching to background channel (some stress tests in debug builds went 3->2 ms). (#125)
This change benefits Columns but was primarily made with Tables in mind.
|
2020-06-08 23:18:23 +02:00 |
|
ocornut
|
8baa4ccff5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-06 20:31:24 +02:00 |
|
ocornut
|
78d5ccfb90
|
ImDrawList: PushColumnsBackground(): Fixed incorrect assert. (#3163)
|
2020-06-06 18:54:46 +02:00 |
|
ocornut
|
41e8837f59
|
Comments, adding some spacing in ImVec2() constructors.
|
2020-06-02 18:13:54 +02:00 |
|
ocornut
|
615e9ae345
|
Docking: Fix undocking (#3243), amend 7b3d3798 (#1738)
|
2020-05-18 15:08:47 +02:00 |
|
omar
|
e4d8267188
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-05-16 14:14:51 +02:00 |
|
Mr. Metric
|
39c978f499
|
Fix typo/bug introduced by 0679e056 (#3231, #3209, #1829, #946, #413)
|
2020-05-15 10:51:51 +02:00 |
|
omar
|
582f4db59b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-05-07 22:13:47 +02:00 |
|
omar
|
9ee442d3f0
|
Metrics: Added a "Settings" section with some details about persistent ini settings. InputText: Assert early on null buffer.
|
2020-05-07 21:34:44 +02:00 |
|
omar
|
0679e05677
|
Internals: Added code in TempInputScalar() to clamp values, NOT used by stock Drag/Float (#3209, #1829, #946, #413)
|
2020-05-07 12:27:21 +02:00 |
|