omar
|
655ebe4eaf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2019-04-16 13:14:10 +02:00 |
|
omar
|
311469e9d6
|
Internals: Columns: Some renaming, extracted code into GetColumnsID().
|
2019-04-16 11:58:54 +02:00 |
|
omar
|
712203dbcb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-04-13 18:53:00 +02:00 |
|
omar
|
fb2626c21b
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
2019-04-13 00:29:27 +02:00 |
|
omar
|
c6f1b7b92a
|
Tests: Added hook/tweaks for imgui-test engine. + Fixed warnings.
|
2019-04-13 00:27:44 +02:00 |
|
omar
|
30d81f53cb
|
PlotLines, PlotHistogram: Ignore NaN values when calculating min/max bounds. (#2485)
|
2019-04-12 22:16:59 +02:00 |
|
omar
|
ee02cdbf03
|
Internals, Docs: Added a bunch of clarification about ButtonBehavior in the form of a table (and to facilitate writing tests)
|
2019-04-12 17:49:40 +02:00 |
|
omar
|
328e4fa7e7
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-04-11 15:53:38 +02:00 |
|
omar
|
07a70dc972
|
Internals: Merge minor things from range_select branch. Added ImGuiButtonFlags_NoHoveredOnNav. Added IsItemToggledSelected() - unused here. Renaming.
|
2019-04-11 15:40:36 +02:00 |
|
omar
|
cf029b3e1c
|
Merge branch 'master' into docking
|
2019-04-08 18:05:52 +02:00 |
|
omar
|
1391904fd2
|
Internals: Selectable: Added ImGuiSelectableFlags_AllowItemOverlap in imgui_internal.h (~ #684, #2341)
|
2019-04-08 17:59:25 +02:00 |
|
omar
|
b53630813e
|
Internals: Tweak ItemSize calls. Added todo items.
|
2019-04-08 16:13:51 +02:00 |
|
omar
|
50ceb25003
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_vulkan.cpp
|
2019-04-07 16:23:31 +02:00 |
|
omar
|
c8fd4afd75
|
Misc: Added IM_MALLOC/IM_FREE macros mimicking IM_NEW/IM_DELETE so user doesn't need to revert to using the ImGui::MemAlloc()/MemFree() calls directly.
|
2019-04-05 20:20:24 +02:00 |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
01e29a3933
|
InputText: Fixed ImGuiInputTextFlags_AllowTabInput leading to two tabs characters being inserted if the back-end provided both Key and Character input. (#2467, #1336)
|
2019-04-03 10:45:51 +02:00 |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
3d8ea352d1
|
InputText: Fixed selection background starts rendering one frame after the cursor movement when first transitioning from no-selection to has-selection. (Bug in 1.69) (#2436) [@Nazg-Gul]
|
2019-03-25 16:06:30 +01:00 |
|
omar
|
abb7d7b18a
|
InputText: Simplify read-only code path.
|
2019-03-25 15:50:23 +01:00 |
|
omar
|
221bf93a55
|
Comments, todo list, remove trailing spaces.
|
2019-03-17 00:56:21 +01:00 |
|
omar
|
cf2c52282d
|
Version 1.70 WIP
|
2019-03-15 13:07:30 +01:00 |
|
omar
|
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 |
|
omar
|
55c02099c5
|
Version 1.69, comments, typos
|
2019-03-13 15:29:43 +01:00 |
|
omar
|
a26085ed53
|
Internals: Fixed Navigation from reaching ImGuiItemFlags_Disabled items (#211) + Examples comments
|
2019-03-12 22:23:56 +01:00 |
|
omar
|
53e0c13be2
|
TabBar: Reworked scrolling policy (when ImGuiTabBarFlags_FittingPolicyScroll is set) to teleport the view when aiming at a tab far away the visible section, and otherwise accelerate the scrolling speed to cap the scrolling time to 0.3 seconds.
|
2019-03-12 20:57:02 +01:00 |
|
omar
|
99d8425173
|
TabBar: Fixed Tab tooltip code making drag and drop tooltip disappear during the frame where the drag payload activate a tab.
|
2019-03-12 18:56:19 +01:00 |
|
omar
|
9afb849e16
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
|
2019-03-12 18:28:47 +01:00 |
|
omar
|
495065f790
|
Fixed Clang and PVS warnings.
|
2019-03-12 12:08:51 +01:00 |
|
omar
|
f254168335
|
InputText: Fixed c779fbb leading to display of the wrong buffer when resizing a buffer. (#2400, #2006, #1443, #1008).
|
2019-03-12 11:56:40 +01:00 |
|
omar
|
65c2220049
|
Internal: Removed unused fields from ImGuiMenuColumns.
|
2019-03-11 20:14:56 +01:00 |
|
omar
|
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 |
|
Haldean Brown
|
79bb4ce128
|
Added ImGuiColorEditFlagsFlags_InputHSV. (#2383, #2384)
|
2019-03-08 18:16:41 +01:00 |
|
omar
|
8e0e91827f
|
ColorEdit: Fixed tooltip not honoring the ImGuiColorEditFlags_NoAlpha contract of never reading the 4th float in the array (value was read and discarded). (#2384)
|
2019-03-08 18:16:41 +01:00 |
|
omar
|
d77d3416d3
|
Merge branch 'master' into docking
|
2019-03-07 18:40:55 +01:00 |
|
omar
|
e9651aaa77
|
TabBar: Fixed ImGuiTabItemFlags_SetSelected being ignored if the tab is not visible (with scrolling policy enabled) or if is currently appearing.
|
2019-03-07 17:45:59 +01:00 |
|
omar
|
1c23981782
|
Made ImS8 and ImS16 explicitly signed in case some crazy SDK decide to flip the signedness over. (#2408)
|
2019-03-07 16:10:44 +01:00 |
|
omar
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-03-06 21:18:46 +01:00 |
|
omar
|
8464df1f6e
|
Internals: ColorEdit: Minor optimizations. Initialize internal arrays as static const, avoid unnecessary HSV->RGB conversion.
|
2019-03-06 19:30:34 +01:00 |
|
omar
|
ea8158acdf
|
Demo: Renamed ShowHelpMarker() -> HelpMarker(). Fixed minor PVS warning. Removed unnecessary casts.
|
2019-03-06 18:24:07 +01:00 |
|
omar
|
c779fbb651
|
InputTextWithHint: Fix for Password fields. Update changelog, demo. (#2400)
|
2019-03-06 17:33:24 +01:00 |
|
Lucas Lazare
|
ab80ee6453
|
Added InputTextWithHint() (#2400)
Squashed commit of the following:
commit 1970d84051
Author: Lucas Lazare <lazarelucas@yahoo.fr>
Date: Tue Mar 5 12:20:39 2019 -0500
Removing sneaky tabulations #2 (why, editor T-T)
I should update my settings, I guess
commit 219bdfcb7f
Author: Lucas Lazare <lazarelucas@yahoo.fr>
Date: Tue Mar 5 12:17:27 2019 -0500
Removing useless check introduced in b0d172
commit 8afd7a2b45
Author: Lucas Lazare <lazarelucas@yahoo.fr>
Date: Tue Mar 5 11:49:24 2019 -0500
Removing sneaky tabulations
commit 8e04908631
Author: Lucas Lazare <lazarelucas@yahoo.fr>
Date: Tue Mar 5 11:45:13 2019 -0500
Moving InputTextHinted code to InputTextEx
commit b0d1723a2f
Author: Lucas Lazare <lazarelucas@yahoo.fr>
Date: Tue Mar 5 00:23:02 2019 -0500
C++11 to C++98
commit 9afeae3998
Author: Lucas Lazare <lazarelucas@yahoo.fr>
Date: Mon Mar 4 23:43:28 2019 -0500
Added InputTextHinted
|
2019-03-06 17:33:05 +01:00 |
|
omar
|
fe48368cb2
|
InputText: Moving some code in anticipation of supporting hint display with password. This commit is aimed at having no visible side effect. (#2400)
|
2019-03-06 15:45:11 +01:00 |
|
omar
|
e02d6014bf
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-03-05 22:13:38 +01:00 |
|
omar
|
344140004b
|
Fixed IsItemDeactivated()/IsItemDeactivatedAfterEdit() from not correctly returning true when tabbing out of a focusable widget (Input/Slider/Drag) in most situations. (#2215, #1875)
+ Minor renaming of a local variable in widget code.
|
2019-03-05 22:09:25 +01:00 |
|
omar
|
26328fc9fe
|
Internal: Tabbing/Focus: Tidying up old code, moved some state to context instead of window. Storing new data will allow us to fix the bug mentioned in #2215 (probably in next commit).
|
2019-03-05 19:51:27 +01:00 |
|
omar
|
076be7ec41
|
MenuItem, Selectable: Fixed disabled widget interfering with navigation (fix c2db7f63 in 1.67).
|
2019-03-05 19:00:19 +01:00 |
|