056af2b1af
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
31fd6c585a
Removed unnecessary ImGui:: qualifiers in internal code.
6 years ago
e73217d6f7
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
ca753829cb
Revert using wchar_t functions ( 9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits.
6 years ago
ede3a3b92d
Fixes crash introduced in previous commit 9cf94d5.
6 years ago
9cf94d5dd6
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
6 years ago
0fe48cbb61
Renamed misc/stl/imgui_stl.h,.cpp to misc/cpp/imgui_stdlib.h in prevision for other files.( #2035 , #2096 )
...
Added misc/README file.
6 years ago
cf0afb48ac
TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments.
...
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
6 years ago
6cc380fc41
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
# imgui.cpp
6 years ago
3d318a6577
ArrowButton(): Fixed arrow shape being horizontally misaligned by (FramePadding.y-FramePadding.x) if they are different.
...
Demo: Added extra usage of AlignTextToFramePadding() in a more visible section.
6 years ago
b85f345369
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_vulkan.cpp
6 years ago
c12da2a607
BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f.
6 years ago
ca5dc0c019
ColorPicker: Replaced the Separator with a Spacing call. ( #2068 )
6 years ago
ec04e8bb05
Fix MSVC's C4312 warning about casting user texture type to void* in ImageButton ( #2080 )
6 years ago
9cc63ba279
Internals: Replace unsigned short with ImWchar when dealing with character storage (missing cases) + in imgui_impl_ file keep using neutral type everywhere, added missing explicit cast in three bindings. ( #2078 )
6 years ago
df65d4a14f
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
d014d0285a
DragFloat: Disabled using power curve when one edge is FLT_MAX (broken in 1.61). Disabled setting a default drag speed when one edge is FLT_MAX. ( #2024 )
6 years ago
af6cf25255
DragFloat: Fixed a situation where dragging with value rounding enabled or with a power curve erroneously wrapped the value to one of the min/max edge. ( #2024 , #708 , #320 , #2075 ).
6 years ago
e2436ca625
Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated.
6 years ago
eb7033e75b
Version 1.66 WIP
6 years ago
b974fffea0
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
e0cab5664a
Version 1.65
6 years ago
5a679a45cc
Renamed stb_truetype.h to imstb_truetype.h, stb_textedit.h to imstb_textedit.h, and stb_rect_pack.h to imstb_rectpack.h. ( #1718 , #2036 )
...
If you were conveniently using the imgui copy of those STB headers in your project, you will have to update your include paths.
The reason for this change is to avoid conflicts for projects that may also be importing their own copy of the STB libraries. Note that imgui's copy of stb_textedit.h is modified.
6 years ago
a2616c79fe
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
e58bc3d5b7
Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. ( #2036 )
6 years ago
31b5b18611
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
bb3184af74
Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) ( #2036 )
6 years ago
af27ec296b
Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
77ba883f23
Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. ( #1427 ) + changed ImGuiIO layout.
6 years ago
b944aa623c
Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';'
6 years ago
bdb30d7145
Merge branch 'master' into viewport
6 years ago
d07f494305
Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. ( #2036 )
...
Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT
6 years ago
bcb1441ce7
Version 1.65 WIP
6 years ago
fd201a90f1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
767649afb1
Fix missing include on some systems to use intptr_t. ( #2036 , #2054 )
6 years ago
0c24fe276c
Merge branch 'master_164' into viewport_164
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
6 years ago
48db5713d6
Version 1.64
6 years ago
38cfcf9fbc
Tweak comments and indexes
6 years ago
a58e4dfd0f
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )
6 years ago
df37a156e8
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index ( #2036 )
6 years ago
d4e49a2697
Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164
...
# Conflicts:
# imgui.cpp
# imgui_widgets.cpp
6 years ago
521405488b
Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
24dfa0c957
Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
158a65c98f
Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
6caf074bd5
Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
905e14f384
Refactor: Moved Plot/Value functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
4be79a8955
Refactor: Moved Menu functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
2d952504ed
Refactor: Moved Combo/ListBox functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
43219d36a6
Refactor: Moved Button/Image/Checkbox/RadioButton/Bullet/ProgressBar functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
99b27488e7
Refactor: Moved Text functions from imgui.cpp to imgui_widgets.cpp ( #2036 )
6 years ago
omar
Elias Daler