Mirrors_UI_SDK/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-09-11 06:07:20 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
5,063 Commits 11 Branches 159 Tags
5ea08394f5d85fbdbcf82ad4cdb13c92fe9f858d
Commit Graph
68 Commits
Author SHA1 Message Date
omar 52ca91ca57 Merge branch 'master' into viewport 2018-11-05 17:29:31 +01:00
omar eb592bf7d3 ListBox(): Fixed frame sizing when items_count==1 unnecessarily showing a scrollbar. (#2173). Tweaked frame sizing so list boxes will look more consistent when FramePadding is far from ItemSpacing. 2018-11-05 14:49:17 +01:00
omar 7fa3e71abb Internals: Moved the FocusableItemUnregister() outside of InputScalarAsWidgetReplacement(), it should not be here and doesn't facilitate reusing InputScalarAsWidgetReplacement(). (cc #2155) 2018-10-30 10:48:21 +01:00
omar 50f6e12d31 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 2018-10-25 23:41:13 +02:00
Konstantin Podsvirov faecf90383 SliderAngle: Added optional format argument to allow users customize precision and make localization. (#2150) 2018-10-25 22:29:29 +02:00
omar 056af2b1af Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2018-10-18 10:56:26 +02:00
omar 31fd6c585a Removed unnecessary ImGui:: qualifiers in internal code. 2018-10-17 10:47:27 +02:00
omar e73217d6f7 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_sdl.cpp
#	imgui.cpp
 2018-10-12 15:50:48 +02:00
omar ca753829cb Revert using wchar_t functions (9cf94d5 + 2eaf5b0). Big mistake, wchar_t is not guaranteed to be 16-bits. 2018-10-12 15:48:38 +02:00
omar ede3a3b92d Fixes crash introduced in previous commit 9cf94d5. 2018-10-12 13:29:13 +02:00
omar 9cf94d5dd6 RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate. 2018-10-12 12:34:47 +02:00
omar 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.
 2018-10-12 11:16:51 +02:00
omar cf0afb48ac TextUnformatted: Using memchr(), fixed not properly testing for text_end bound + comments. 
Internals: Added ImStreolRange() + used in LogRenderedText() + comments.
 2018-10-11 12:53:10 +02:00
omar 6cc380fc41 Merge branch 'master' into viewport 
# Conflicts:
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
#	imgui.cpp
 2018-09-26 21:34:52 +02:00
omar 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.
 2018-09-20 10:24:29 +02:00
omar 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
 2018-09-14 11:32:55 +02:00
omar c12da2a607 BeginMenu(): Fixed menu popup horizontal offset being off the item in the menu bar when WindowPadding=0.0f. 2018-09-14 11:28:08 +02:00
omar ca5dc0c019 ColorPicker: Replaced the Separator with a Spacing call. (#2068) 2018-09-14 10:05:53 +02:00
Elias Daler ec04e8bb05 Fix MSVC's C4312 warning about casting user texture type to void* in ImageButton (#2080) 2018-09-12 22:58:45 +02:00
omar 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) 2018-09-11 22:00:57 +02:00
omar df65d4a14f Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 2018-09-11 11:18:46 +02:00
omar 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) 2018-09-11 11:15:06 +02:00
omar 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). 2018-09-11 10:55:52 +02:00
omar e2436ca625 Nav, Focus: Fixed ImGuiWindowFlags_NoBringToFrontOnFocus windows not being restoring focus properly after the main menu bar or last focused window is deactivated. 2018-09-10 20:40:21 +02:00
omar eb7033e75b Version 1.66 WIP 2018-09-06 21:44:59 +02:00
omar b974fffea0 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 2018-09-06 15:59:35 +02:00
omar e0cab5664a Version 1.65 2018-09-06 15:58:58 +02:00
omar 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.
 2018-09-06 15:58:25 +02:00
omar a2616c79fe Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 2018-09-06 11:42:11 +02:00
omar e58bc3d5b7 Refactor: Tweaked and improved the sectioning to facilitate grepping/moving around and applied to all files. (#2036) 2018-09-06 11:36:00 +02:00
omar 31b5b18611 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 2018-09-05 20:59:27 +02:00
omar bb3184af74 Refactor: moved low-layout helpers to imgui_widgets.cpp (Spacing, Dummy, NewLine, Separator, etc.) (#2036) 2018-09-05 20:54:28 +02:00
omar af27ec296b Merge branch 'master' into viewport + added viewport ConfigFlags/BackendFlags 
# Conflicts:
#	imgui.cpp
#	imgui.h
 2018-09-05 17:38:47 +02:00
omar 77ba883f23 Renamed io.OptCursorBlink/io.ConfigCursorBlink to io.ConfigInputTextCursorBlink. (#1427) + changed ImGuiIO layout. 2018-09-05 17:29:47 +02:00
omar b944aa623c Minor mostly inconsequential merges from Viewport + LoadIniSettingsFromMemory() entirely skip lines starting with ';' 2018-09-05 11:52:48 +02:00
omar bdb30d7145 Merge branch 'master' into viewport 2018-09-05 11:08:57 +02:00
omar d07f494305 Internals: Exposed SliderBehaviorT, DragBehaviorT, RoundScalarWithFormatT, SliderCalcRatioFromValueT. (#2036) 
Renamed RoundScalarWithFormat -> RoundScalarWithFormatT.
Renamed SliderBehaviorCalcRatioFromValue -> SliderCalcRatioFromValueT
 2018-09-03 14:49:13 +02:00
omar bcb1441ce7 Version 1.65 WIP 2018-09-03 14:38:04 +02:00
omar fd201a90f1 Merge branch 'master' into viewport 
# Conflicts:
#	imgui.cpp
 2018-08-31 18:39:02 +02:00
omar 767649afb1 Fix missing include on some systems to use intptr_t. (#2036, #2054) 2018-08-31 18:07:47 +02:00
omar 0c24fe276c Merge branch 'master_164' into viewport_164 
# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp
 2018-08-31 10:28:21 +02:00
omar 48db5713d6 Version 1.64 2018-08-31 10:00:03 +02:00
omar 38cfcf9fbc Tweak comments and indexes 2018-08-31 09:59:58 +02:00
omar a58e4dfd0f Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036) 2018-08-30 21:16:23 +02:00
omar df37a156e8 Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036) 2018-08-30 20:51:57 +02:00
omar d4e49a2697 Merge commit '2714f8fa23d8ca44e98272baf885d12b5185d084' into viewport_164 
# Conflicts:
#	imgui.cpp
#	imgui_widgets.cpp
 2018-08-30 19:29:46 +02:00
omar 521405488b Refactor: Moved Slider/Drag/Input functions + support DataType stuff from imgui.cpp to imgui_widgets.cpp (#2036) 2018-08-30 19:21:50 +02:00
omar 24dfa0c957 Refactor: Moved InputText functions from imgui.cpp to imgui_widgets.cpp (#2036) 2018-08-30 19:12:33 +02:00
omar 158a65c98f Refactor: Moved ColorEdit/ColorPicker/ColorButton/etc. functions from imgui.cpp to imgui_widgets.cpp (#2036) 2018-08-30 19:04:49 +02:00
omar 6caf074bd5 Refactor: Moved Tree/Selectable functions from imgui.cpp to imgui_widgets.cpp (#2036) 2018-08-30 19:04:42 +02:00