omar
|
93b032ea92
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
|
2018-06-05 15:51:52 +02:00 |
|
omar
|
6d98c0323b
|
Nav: Added support for PageUp/PageDown (explorer-style: first aim at bottom/top most item, when scroll a page worth of contents). (#787)
|
2018-06-05 15:49:33 +02:00 |
|
omar
|
2bdf0b54a2
|
Changelog formatting update, Todo, comments. Tweak Child demo. Shuffle some code in NavUpdate().
|
2018-06-05 15:34:22 +02:00 |
|
omar
|
92b7d6bc4f
|
Added ImGuiDragDropFlags_AcceptNoPreviewTooltip flag to disable drag source tooltip from the target site (#143)
|
2018-05-28 20:57:41 +02:00 |
|
omar
|
f843facba4
|
Internals: PushItemFlag() flags are inherited by BeginChild().
|
2018-05-28 15:30:42 +02:00 |
|
omar
|
03c8a78f04
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.h
# examples/vulkan_example/imgui_impl_glfw_vulkan.cpp
|
2018-05-25 12:44:56 +02:00 |
|
omar
|
b88fbd69cc
|
Drag and Drop: BeginDragDropSource(): Offset tooltip position so it is off the mouse cursor, but also closer to it than regular tooltips, and not clamped by viewport. (#1739)
|
2018-05-23 23:19:01 +02:00 |
|
omar
|
663e2c9237
|
Examples: GLFW: Made it possible to Shutdown/Init the backend again (by reseting the time storage properly). Changelog. Added to Vulkan example. (#1827)
|
2018-05-21 10:36:50 +02:00 |
|
omar
|
bf56b6b9a5
|
ColorEdit3, ColorEdit4, ColorButton: Added ImGuiColorEditFlags_NoDragDrop flag to disable ColorEditX as drag target and ColorButton as drag source. (#1826)
|
2018-05-21 10:13:21 +02:00 |
|
omar
|
01429e7d16
|
Merge branch 'master' into viewport
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-17 15:03:56 +02:00 |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
2018-05-17 14:12:37 +02:00 |
|
omar
|
640c056602
|
TreeNode: Fixed nodes with ImGuiTreeNodeFlags_Leaf flag always returning true which was meaningless. Tweak demo.
|
2018-05-14 23:36:37 +02:00 |
|
omar
|
e11610d6ff
|
Nav: To keep the navigated item in view we also attempt to scroll the parent window as well as the current window. (#787)
|
2018-05-14 19:50:48 +02:00 |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
2018-05-14 19:19:19 +02:00 |
|
omar
|
b0fb340b57
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
|
2018-05-14 13:15:21 +02:00 |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
2018-05-14 12:34:47 +02:00 |
|
omar
|
3f29ed6fd5
|
ColorEdit: Fixed not being able to pass the ImGuiColorEditFlags_NoAlpha or ImGuiColorEditFlags_HDR flags to SetColorEditOptions(). Demo tweak.
|
2018-05-13 23:41:43 +02:00 |
|
omar
|
2a2bb8970d
|
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
|
2018-05-13 22:31:29 +02:00 |
|
omar
|
ff033f431b
|
Added IMGUI_DISABLE_MATH_FUNCTIONS in imconfig.h to make it slightly easier to redefine wrappers to std maths functions such as fabsf(), fmodf(), etc. Comments.
|
2018-05-13 21:04:07 +02:00 |
|
omar
|
8adbf081af
|
Demo: Renamed "fixed overlay" to "simple overlay" because it's not fixed any more!
|
2018-05-12 18:07:22 +02:00 |
|
omar
|
a7a1b3b0a7
|
Demo: Added demo for DragScalar(), InputScalar(), SliderScalar(). (#643)
|
2018-05-12 17:53:34 +02:00 |
|
omar
|
7475c1e7dd
|
Data types: DragScalar: Fixed speed of integer values tweaking with keyboard/gamepad when speed < 1. Enforce min/max bounds when power curves are used. SliderScalar: Fixed integer/slow tweaking. (#643)
|
2018-05-12 17:39:34 +02:00 |
|
omar
|
85f3ba844c
|
Merge branch 'master' into viewport
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# imgui.cpp
# imgui.h
|
2018-05-11 22:22:41 +02:00 |
|
omar
|
0dc18a6ca6
|
Documentation tweaks, comments
|
2018-05-11 16:54:50 +02:00 |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
2018-05-11 16:48:50 +02:00 |
|
omar
|
14f575ff76
|
Scrolling: Fixed a case where using SetScrollHere(1.0f) at the bottom of a window on the same frame the window height has been growing would have the scroll clamped using the previous height. (#1804)
|
2018-05-10 14:31:04 +02:00 |
|
omar
|
39f4761ff7
|
TODO list update + Changelog and comments for #1803.
|
2018-05-09 15:48:33 +02:00 |
|
omar
|
8da0d42ef2
|
Moved DragScalar, InputScalar, SliderScalar to imgui.h as well as ImGuiDataType (#320, #643, #708, #1011)
|
2018-05-08 19:52:55 +02:00 |
|
omar
|
280c05e4f8
|
Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit.
|
2018-05-08 11:02:38 +02:00 |
|
omar
|
f13f10e725
|
Settings: Comments (#923, #993)
|
2018-05-07 22:37:10 +02:00 |
|
omar
|
4ff23d3306
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_dx9.cpp
# imgui.cpp
# imgui.h
|
2018-05-07 22:23:58 +02:00 |
|
omar
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
2018-05-07 22:18:45 +02:00 |
|
omar
|
787a475650
|
Skip missing font glyphs to 1) avoid using space for missing glyphs and 2) allow merging fonts with overlapping ranges. Demo: Fixed displaying ? instead of greyed out empty box. (#1671, #1703)
|
2018-05-07 18:03:00 +02:00 |
|
omar
|
807c4f0ea4
|
Ran a spell checker for sanity.
|
2018-05-07 14:44:35 +02:00 |
|
omar
|
4310bad32a
|
Examples: DirectX9: Comments, updated changelog, notes about usage of imconfig.h (#1790, #1687)
|
2018-05-07 11:52:48 +02:00 |
|
omar
|
7640439747
|
DragInt: Patch old format strings to replace %f by %d when using the DragInt() entry point. (#320, #643, #708, #1011)
|
2018-05-03 21:35:04 +02:00 |
|
omar
|
17d3c6305e
|
Ran a spell checker for sanity.
|
2018-05-03 21:11:53 +02:00 |
|
omar
|
086c3925c4
|
Internals: Fixed DragInt* default format string. InputScalar(), InputScalarN(), removed InputFloatN(), InputInt(). Note that DragInt2/3/4 will %f format strings will currently be broken. (#320, #643, #708, #1011)
|
2018-05-03 19:42:35 +02:00 |
|
omar
|
6c932479f2
|
Internal: DragScalar(), InputScalar() now support signed/unsigned, 32/64 bits, float/double data types. (#320, #643, #708, #1011)
|
2018-05-03 17:34:38 +02:00 |
|
omar
|
93b8580a8d
|
Internals: DragFloat: Fixed power handling. Use an temporary accumulator and no absolute values so we will be able to manipulate double as well as 64-bit integers. (#1011, #708, #320)
|
2018-05-03 17:34:33 +02:00 |
|
omar
|
7df985bc5c
|
Nav: Fixed hovering a Selectable() with the mouse so that it update the navigation cursor. Fixed c8b9b2c6 which was incorrect (#787)
|
2018-04-30 19:40:25 +02:00 |
|
omar
|
92f0165f85
|
DragFloat, SliderFloat: Rounding scalar using the provided format string instead of parsed precision. (#648)
|
2018-04-30 16:44:57 +02:00 |
|
omar
|
6881d065b8
|
DragFloat/SliderFloat internal InputScalar trip trailing decoration off the format string when presenting an edit box to the user. (#648)
|
2018-04-30 15:59:59 +02:00 |
|
omar
|
f80314754c
|
InputFloat,InputFloat2,InputFloat3,InputFloat4: Added variations taking a more flexible and consistent optional "const char* format" parameter instead of "int decimal_precision". This allow using custom formats to display values in scientific notation, and is generally more consistent with other API. Obsoleted functions using the optional "int decimal_precision" parameter. (#648)
|
2018-04-28 00:11:40 +02:00 |
|
omar
|
8a38271a7c
|
SliderFloat, DragFloat: Fix to allow input of scientific notation when Ctrl+Clicking a slider or drag, matching the change done in c19b2781 for InputFloat(). (#648, #1011)
|
2018-04-27 23:18:28 +02:00 |
|
omar
|
066550de68
|
DragFloat, DragInt: Cancel mouse tweak when current value is initially past the min/max boundaries and mouse is pushing in the same direction (keyboard/gamepad version already did this).
|
2018-04-27 19:15:25 +02:00 |
|
omar
|
101f9b42b7
|
InputText: Fixed returning true when edition is cancelled with Esc and the current buffer matches the initial value.
|
2018-04-27 17:32:03 +02:00 |
|
omar
|
eb1c36fdfb
|
Added IMGUI_CHECKVERSION() macro to compare version string and data structure sizes in order to catch issues with mismatching compilation unit settings. (#1695, #1769)
|
2018-04-25 22:07:14 +02:00 |
|
omar
|
0b1d6a0d52
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2018-04-25 18:13:23 +02:00 |
|
omar
|
e3453d0dc4
|
Misc: Comments and shallow/small changes (merged from viewport branch to minimize branch drift).
|
2018-04-25 17:58:53 +02:00 |
|