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
|
e91d275b10
|
Merge branch 'master' into docking
# Conflicts:
# imgui_demo.cpp
|
2019-03-06 21:18:46 +01:00 |
|
omar
|
510342f024
|
Examples: DirectX9: Minor changes to match the other DirectX examples more closely. (#2394)
|
2019-03-06 18:00:04 +01:00 |
|
omar
|
c779fbb651
|
InputTextWithHint: Fix for Password fields. Update changelog, demo. (#2400)
|
2019-03-06 17:33:24 +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
|
076be7ec41
|
MenuItem, Selectable: Fixed disabled widget interfering with navigation (fix c2db7f63 in 1.67).
|
2019-03-05 19:00:19 +01:00 |
|
omar
|
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 |
|
omar
|
ac4842fa17
|
Nav: Fixed Ctrl+Tab keeping active InputText() of a previous window active after the switch. (#2380)
|
2019-03-05 12:03:54 +01:00 |
|
omar
|
8414c0bb09
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2019-03-04 18:08:19 +01:00 |
|
omar
|
94e794f81b
|
Renamed GetOverlayDrawList() to GetForegroundDrawList() for consistency. Kept redirection function (will obsolete). (#2391)
Demo: Using GetBackgroundDrawList() and GetForegroundDrawList() in "Custom Rendering" demo.
|
2019-03-04 16:35:50 +01:00 |
|
omar
|
96b13760d4
|
Added GetBackgroundDrawList() helper to quickly get access to a ImDrawList that will be rendered behind every other windows. (#2391)
|
2019-03-04 16:10:51 +01:00 |
|
omar
|
49eb5f0280
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
|
2019-03-03 23:34:56 +01:00 |
|
omar
|
beb3062dc5
|
Examples: OpenGL: Fix to be able to run on ES 2.0 / WebGL 1.0. [@rmitton, @gabrielcuvillier]
|
2019-03-03 23:34:28 +01:00 |
|
omar
|
1c67d09c0b
|
ColorPicker: Fix assertion when running in a collapsed window and dragging its title bar (#2389)
|
2019-03-01 00:06:36 +01:00 |
|
omar
|
1d0b4df3d9
|
Misc: Asserting in NewFrame() if style.WindowMinSize is zero or smaller than (1.0f,1.0f). Internal: ImHash functions tweaks. Added InputText() to query status section.
|
2019-02-28 22:57:22 +01:00 |
|
omar
|
ff0c6c2bde
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-02-27 19:00:09 +01:00 |
|
omar
|
f02705fbaa
|
InputInt, InputScalar: +/- buttons now respects the natural type limits instead of overflowing or underflowing the value.
|
2019-02-27 18:59:17 +01:00 |
|
omar
|
736d3e2654
|
DragScalar, InputScalar, SliderScalar: Added support for u8/s8/u16/s16 data types. We are reusing function instances for larger types to reduce code size. (#643, #320, #708, #1011)
|
2019-02-27 18:16:03 +01:00 |
|
omar
|
6de09a5e48
|
Renamed ColorEdit/ColorPicker's ImGuiColorEditFlags_RGB/_HSV/_HEX flags to respectively ImGuiColorEditFlags_DisplayRGB/_DisplayHSV/_DisplayHex. This is anticipation of adding new flags to ColorEdit/ColorPicker functions which would make those ambiguous. (#2384) [@haldean]
|
2019-02-27 16:45:58 +01:00 |
|
omar
|
75641926e1
|
Merge branch 'allegro-touch' of https://github.com/dos1/imgui into dos1-allegro-touch
# Conflicts:
# examples/imgui_impl_allegro5.cpp
|
2019-02-27 14:39:41 +01:00 |
|
omar
|
5e3a1de4e6
|
Plot: Fixed divide-by-zero in PlotLines() when passing a count of 1. (#2387) [@Lectem]
|
2019-02-27 14:25:37 +01:00 |
|
omar
|
6b43a314bf
|
Merge branch 'master' into docking
|
2019-02-26 12:53:38 +01:00 |
|
omar
|
cf3cb7cf7e
|
InputText: Fixed various display corruption related to swapping the underlying buffer while a input widget is active (both for writable and read-only paths). Often they would manifest when manipulating the scrollbar of a multi-line input text.
|
2019-02-26 12:50:44 +01:00 |
|
omar
|
8915f7933a
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-02-24 23:24:07 +01:00 |
|
omar
|
9558e327d2
|
Log/Capture: Fixed extraneous leading carriage return. Fixed an issue when empty string on a new line would not emit a carriage return.
|
2019-02-23 16:22:55 +01:00 |
|
omar
|
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 |
|
omar
|
3eba840053
|
Nav: Fixed a tap on AltGR (e.g. German keyboard) from navigation to the menu layer. (follow and extend on e.g #369, #370)
|
2019-02-23 14:50:36 +01:00 |
|
omar
|
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 |
|
omar
|
9da48c16c5
|
TabBar: Added extra mis-usage error recovery. Past the assert, common mis-usage don't lead to hard crashes any more, facilitating integration with scripting languages. (#1651)
|
2019-02-22 12:27:41 +01:00 |
|
omar
|
0f83145aa8
|
TabBar: Fixed a crash when using BeginTabBar() recursively (didn't affect docking). (#2371)
Added ImPool::Contains() helper.
|
2019-02-22 12:24:27 +01:00 |
|
omar
|
cc3be5d428
|
InputText: Fixed an edge case crash that would happen if another widget sharing the same ID is being swapped with an InputText that has yet to be activated.
|
2019-02-21 19:55:36 +01:00 |
|
omar
|
2068dd509c
|
Examples: OpenGL: Fix for OSX not supporting OpenGL 4.5, we don't try to read GL_CLIP_ORIGIN even if the OpenGL headers/loader happens to define the value. (#2366, #2186)
|
2019-02-20 14:31:19 +01:00 |
|
omar
|
7c51cba74f
|
InputInt, InputFloat, InputScalar: Fix to keep the label of the +/- buttons centered when style.FramePadding.x is abnormally larger than style.FramePadding.y. Since the buttons are meant to be square (to align with e.g. color button) we always use FramePadding.y. (#2367)
|
2019-02-20 00:20:11 +01:00 |
|
omar
|
257f5d204e
|
Version 1.69 WIP
|
2019-02-20 00:11:36 +01:00 |
|
omar
|
9dc02464a4
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-02-19 13:04:35 +01:00 |
|
omar
|
3c15dffc94
|
Version 1.68
|
2019-02-19 12:50:46 +01:00 |
|
omar
|
5bf9029bf9
|
Merge branch 'master' into docking
|
2019-02-18 12:16:13 +01:00 |
|
omar
|
f5bf6e38d2
|
Font: Fixed assert when specifying duplicate/overlapping ranges within a same font. (#2353, #2233)
|
2019-02-18 12:11:46 +01:00 |
|
omar
|
dd14adc731
|
Examples: Vulkan: Support draw_data->FramebufferScale correctly matching a79785c for on Metal/GL2/GL3. (#2306, #1676)
|
2019-02-16 12:32:44 +01:00 |
|
omar
|
09c9bf2edb
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-02-14 20:35:11 +01:00 |
|
omar
|
76dbff37cd
|
Selectable: Tweaks for #2347 (demo, changelog, member position)
|
2019-02-14 20:29:50 +01:00 |
|
omar
|
3c07ec6a61
|
Made it illegal/assert when io.DisplayTime == 0.0f (with an exception for the first frame).
Causing too many subtle side-effect, e.g. IsNavInputPressed() would return true multiple times in a row.
|
2019-02-14 17:14:29 +01:00 |
|
omar
|
2206df9e7a
|
Demo: Added Auto-Scroll option in Log/Console. Comments. Removed some ImColor() uses.
|
2019-02-14 14:08:36 +01:00 |
|
omar
|
0236bc246f
|
Scrollbar: Fade out and disable interaction when too small, in order to facilitate using the resize grab on very small window, as well as reducing visual noise/overlap. (+1 squashed commits)
Internals: Added GetScrollbarID(). (#1185)
|
2019-02-14 14:07:59 +01:00 |
|
omar
|
fcdf704dfa
|
Changelog: Added changelog from 1.40 to 1.47 (pasted from the Releases section) + some wrapping.
|
2019-02-13 14:55:28 +01:00 |
|