87ded34f9f
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui_widgets.cpp
6 years ago
677e64e71e
Internal: InputText: Comments. Renamed internal member. Renamed ImGuiStb->ImStb.
6 years ago
257f5d204e
Version 1.69 WIP
6 years ago
9dc02464a4
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
3c15dffc94
Version 1.68
6 years ago
5bf9029bf9
Merge branch 'master' into docking
6 years ago
f5bf6e38d2
Font: Fixed assert when specifying duplicate/overlapping ranges within a same font. ( #2353 , #2233 )
6 years ago
09c9bf2edb
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
93d1179805
Examples: Extracted gamepad code into ImGui_ImplGlfw_UpdateGamepads(). Renamed matching Win32 function for consistency.
...
Added more link to nothing's oversample document. Spacing bits.
6 years ago
2cada3c143
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_widgets.cpp
6 years ago
a79785c0b9
ImDrawData: Added FramebufferScale field (currently a copy of the value from io.DisplayFramebufferScale).
...
This is to allow render functions being written without pulling any data from ImGuiIO, allowing incoming multi-viewport feature to behave on Retina display and with multiple displays. If you are not using a custom binding, please update your render function code ahead of time, and use draw_data->FramebufferScale instead of io.DisplayFramebufferScale. (#2306 , #1676 )
Examples: Metal, OpenGL2, OpenGL3: Fixed offsetting of clipping rectangle with ImDrawData::DisplayPos != (0,0) when the display frame-buffer scale scale is not (1,1). While this doesn't make a difference when using master branch, this is effectively fixing support for multi-viewport with Mac Retina Displays on those examples. (#2306 ) Also using ImDrawData::FramebufferScale instead of io.DisplayFramebufferScale.
Examples: Clarified the use the ImDrawData::DisplayPos to offset clipping rectangles.
6 years ago
4b41d3b280
ImFont: Rearranged members toward an optimal CalcTextSize() loop. Removed comments from destructor. Made constructor more explicit.
6 years ago
be107ba8f8
Merge branch 'master' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
6 years ago
d38f4dc143
Tabs: Non-docking tab bars are storing names to allow tab list button + whole style scaling. Added ImGuiTabBarFlags_TabListPopupButton flag to show a popup button on manual tab bars. Locking FramePadding for the scope of a tab-bar to avoid sheering/clipping of tab item. Made scaling of tab ellipsis less awkward. ( #261 , #351 )
6 years ago
8e44aacc8e
Fonts: Fixed crash if FontGlobalScale is zero. Correctly debug naming default font if not 13 px. Demo: Moved PopupRounding along with other rounding values. Metrics: Displaying indexes with idx to be correct / less misleading.
6 years ago
13a5f5ba8b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
4e8e177cac
Persistently fixing some PVS-Studio static analyzer false positive warnings.
6 years ago
c3c2cd1e82
Fix various XCode and PVS-Studio static analyzer warnings ( #2309 )
6 years ago
f94af2f5c5
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_draw.cpp
6 years ago
8079344cee
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_sdl_vulkan/main.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.h
# imgui.cpp
6 years ago
2c38b32db1
Removed trailing spaces ( #2038 , #2299 )
6 years ago
f94ba546ba
Added checks for "zero-as-null-pointer-constant" warnings for older Clang ( #2299 , followup to #2277 )
6 years ago
82e31d34f0
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_win32.cpp
6 years ago
bebb07f12d
ImFontAtlas: Added 0x2000-0x206F general punctuation range to default ChineseFull/ChineseSimplifiedCommon ranges. ( #2093 )
6 years ago
b5144e477f
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
e9c625a1dc
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# imgui_demo.cpp
6 years ago
8cbb91261e
ImDrawList: Fixed AddCircle(), AddCircleFilled() angle step being off, which was visible when drawing a "circle" with a small number of segments (e.g. an hexagon). ( #2287 ) [@baktery]
...
+ Demo tweaks
6 years ago
32c4e01267
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
6 years ago
06aaf23877
Various tweaks and fixes as suggested by PVS Studio (thanks PVS Studio!)
6 years ago
8a45c56c2c
Merge branch 'viewport' into docking
6 years ago
9391a97fbf
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_win32.cpp
# examples/imgui_impl_win32.h
6 years ago
95ee99e6aa
Version 1.68 WIP
6 years ago
ff4bd758ca
Merge branch 'viewport' into docking
6 years ago
e24674fc0e
Merge branch 'master' into viewport
6 years ago
7a5058e3bf
Version 1.67
6 years ago
6e41745f31
Added a bunch of diagnostic ignore to cope with Clang -Weverything being absurd. Also fixed two legit warnings. ( #2277 )
6 years ago
529fccd9c2
Merge branch 'viewport' into docking
6 years ago
4ee4f65c70
Merge branch 'master' into viewport
6 years ago
651130002f
ImFontAtlas: Fixed allocating for last bit (would only affect is that last codepoint is a multiple of 32). ( #2270 )
6 years ago
9a9712807e
ImFontAtlas: Rewrote stb_truetype based builder.
...
- Atlas width is now properly based on total surface rather than glyph count (unless overridden with TexDesiredWidth).
- Fixed atlas builder so missing glyphs won't influence the atlas texture width. (#2233 )
- Fixed atlas builder so duplicate glyphs (when merging fonts) won't be included in the rasterized atlas.
6 years ago
8011197c50
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
6 years ago
c96aaef132
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
9ad341902d
ImDrawList: Optimized some of the functions for performance of debug builds where non-inline function call cost are non-negligible.
6 years ago
6b32570644
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui_internal.h
# imgui_widgets.cpp
6 years ago
5af930f97a
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
6 years ago
acfa4050ec
Tweak changelog + tweak internal render helper functions.
6 years ago
5cb7ce2085
Renamed ImFont::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).
6 years ago
e043b89814
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.h
6 years ago
02501f07c3
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
8399fb5071
Changed ImGuiCol_ChildBg to (0,0,0,0) in Dark style instead of (1,1,1,0), to match other styles. Shouldn't have any effect for the end-user.
6 years ago
067b691fd8
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/TODO.txt
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
# imgui_widgets.cpp
6 years ago
c40feabe4d
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
54a60aaa40
Added BETA api for Tab Bar/Tabs widgets. ( #261 , #351 ) (merged this feature from the from Docking branch so it can be used earlier as as standalone feature)
...
- Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem(), SetTabItemClosed() API.
- Added ImGuiTabBarFlags flags for BeginTabBar().
- Added ImGuiTabItemFlags flags for BeginTabItem().
- Style: Added ImGuiCol_Tab, ImGuiCol_TabHovered, ImGuiCol_TabActive, ImGuiCol_TabUnfocused, ImGuiCol_TabUnfocusedActive colors.
- Demo: Added Layout->Tabs demo code.
- Demo: Added "Documents" example app showcasing possible use for tabs.
6 years ago
5105c6c0d0
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
6 years ago
3a678d48b1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
6 years ago
10e13dd6bb
Version 1.67 WIP (again, this time IMGUI_VERSION_NUM has leeway for another hot-fix).
6 years ago
ac10889bde
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
6 years ago
65e579e558
Merge branch 'master' into viewport
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_vulkan.cpp
# examples/imgui_impl_win32.cpp
# imgui.h
# imgui_demo.cpp
6 years ago
801645d350
Version 1.66b (will revisit how to change IMGUI_VERSION_NUM across versions, this commit reduces the numerical IMGUI_VERSION_NUM compared to the commit on Nov 22).
6 years ago
34e18ef771
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
6 years ago
8289e5f6b4
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
6 years ago
84238240d6
Fixed a text rendering/clipping bug introduced in 1.66 (on 2018-10-12, commit ede3a3b9) that affect single ImDrawList::AddText() calls with single strings larger than 10k. Text/TextUnformatted() calls were not affected, but e.g. InputText() was.
6 years ago
3335e6688f
Include <alloca.h> also on macOS (and osxcross) ( #2218 )
6 years ago
d23c69d319
Docking: Added context menu option to hide the tab bar of single-window dock nodes, similar to Unreal. ( #2109 )
6 years ago
ddc3f8f069
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui_internal.h
6 years ago
5261e5a6ba
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
6 years ago
d27ffefbd4
Version 1.67 WIP
6 years ago
2515413080
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_widgets.cpp
6 years ago
d87b80c6c1
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
6 years ago
da3c4330c1
Version 1.66
6 years ago
5f8c9ae0ef
Merge branch 'viewport' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
056af2b1af
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
8606d9fa11
Fix Clang/GCC's null-conversion warning: ( #2081 )
...
The warning is "implicit conversion of NULL constant to 'unsigned int' [-Wnull-conversion]". Happens when ImTextureID is not a void*, but unsigned int, for example.
6 years ago
e73217d6f7
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
6 years ago
2eaf5b03df
Fixes crash introduced in previous commit 9cf94d5.
6 years ago
ede3a3b92d
Fixes crash introduced in previous commit 9cf94d5.
6 years ago
c398153b40
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
9cf94d5dd6
RenderText(), InputTextMultiline(): Optimization for large text by using memchr, wmemchr, wcschr when appropriate.
6 years ago
bd82539ad5
Docking: Fixed DockSpace() child window displaying a scrollbar behind the node backgrounds. Rename ImGuiCol_DockingBg to ImGuiCol_DockingEmptyBg. Added ImGuiDockNode::IsLeaftNode(). ( #2109 )
6 years ago
c6193d0605
Merge branch 'viewport' into docking
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
5719b23e01
ImDrawList: Fixed AddConvexPolyFilled() undefined behavior when passing points_count smaller than 3, in particular, points_count==0 could lead to a memory stomp if the draw list was previously empty.
6 years ago
b55b9aee9b
Fixed bad merge ( a82be53) where we lost the version number in Docking branch + moved Docking related API together for now.
6 years ago
e32256b4b4
Merge branch 'viewport' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui_demo.cpp
# imgui_internal.h
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
201fcfd2e5
Internals: Replace unsigned short with ImWchar when dealing with character storage. ( #2078 )
6 years ago
df65d4a14f
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
6 years ago
a82be53407
Merge branch 'docking2' into viewport_docking
...
# Conflicts:
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
6 years ago
bd5b38e232
Docking: Added Docking system. Enable with io.ConfigFlags |= ImGuiConfigFlags_DockingEnable. (Part 1) ( #351 )
6 years ago
58d46e1fe6
Tabs: Added BeginTabBar(), EndTabBar(), BeginTabItem(), EndTabItem() + demo. ( #261 , #351 )
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
a848807847
Minor inconsequential merges from Master/Docking branches
6 years ago
bdb30d7145
Merge branch 'master' into viewport
6 years ago
bcb1441ce7
Version 1.65 WIP
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
6c34bffbb5
Version 1.64 WIP
6 years ago
f2aa124eb8
Version 1.64 WIP
6 years ago
36b2f64051
Merge branch 'master' into viewport
...
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
6 years ago
9e0f24dcb6
Version 1.63
6 years ago
92edb7a4e3
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
6 years ago
f81caac459
Merge branch 'master' into viewport
...
# Conflicts:
# imgui.cpp
# imgui.h
6 years ago
a082692b0a
ImFontAtlas Comments ( #2042 ) + added ImGuiFontAtlas_None for consistency.
6 years ago
a4191857c1
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
6 years ago
68448c5faa
ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.
6 years ago
975b5a7310
ImDrawList: Fixed clipping of leading lines above the clipping rectangle from counting in the worst case vertices reservation. (fix code added in #200!)
6 years ago
e5f2295398
Merge branch 'master' into viewport
...
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
7 years ago
fda9dc8e18
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. ( #2013 )
7 years ago
4d5dcdb57a
Internals: Changed signature of ShadeVerts functions to remove pointers. ( #1286 , #1700 , #1986 )
7 years ago
b5b972d0ef
ImFontAtlas::AddFontDefault: Made it possible to override glyph ranges. ( #1965 )
7 years ago
6211f40f3d
Internals: Drag and Drop: default drop preview use a narrower clipping rectangle (no effect here, but other branches uses a narrow clipping rectangle that was too small so this is a fix for it) + Comments
7 years ago
4ebd442a24
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). ( #1958 )
7 years ago
7e59eb026b
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. ( #1950 )
7 years ago
5e73e969fb
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
7 years ago
23288547ec
Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939 )
7 years ago
c7016c25e8
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. ( #787 )
7 years ago
93950b8c32
Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code.
7 years ago
645ab6633c
Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. ( #1917 , #1319 , #276 )
7 years ago
6e67afc500
Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. (followup to #1914 )
7 years ago
62b3d7c51e
Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. ( #1913 , #1914 )
7 years ago
ecd9a223e3
add hand cursor support (+11 squashed commit)
7 years ago
c1d8dee6c5
Version 1.63 WIP
7 years ago
fb0106fad2
Demo: Fixed incorrect response to Begin() returning false in overlay demo (which cannot happen since we don't have a title bar, but that doesn't make it a good behaving demo!).
7 years ago
1b74e3be02
Version 1.62
7 years ago
f5bf9f509c
ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. ( #1869 )
7 years ago
d44faa165a
Added GetGlyphRangesChineseSimplifiedCommon() helper that returns a list of ~2500 most common Simplified Chinese characters. Renamed GetGlyphRangesChinese() to GetGlyphRangesChineseFull() to distinguish other variants and discourage using the full set. ( #1859 )
...
Changed the accumulative encoding to remove the implicit +1 which only saved a little space and made things more confusing.
7 years ago
6c684ae39b
Fixed GCC pre-8 build. ( #1822 ) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo
7 years ago
64b1645deb
Disabled GCC 8.1.0 warnings -Wclass-memaccess ( #1822 )
7 years ago
d5c8f404b2
Remove trailing white spaces.
7 years ago
036dce634e
Version 1.62 WIP
7 years ago
78b28d545f
Version 1.61 + todo additions
7 years ago
2a2bb8970d
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
7 years ago
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.
7 years ago
8149408408
Merge branch 'data_types'
...
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
7 years ago
280c05e4f8
Fix to allow compiling in unity builds where stb_rectpack/stb_truetype may be already included in the same compilation unit.
7 years ago
0bf43b3a1b
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. ( #923 , #993 )
7 years ago
6eda9ed3fb
Skip missing font glyphs V2 revert changes to stb_truetype.h (
7 years ago
a62f195e83
Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.
7 years ago
28edece04f
Comments, minor tweaks
7 years ago
928a4ad315
Begin: moved tooltip position code in an else block. Misc comments
7 years ago
6f1f5cbc20
Version 1.61 WIP
7 years ago
54fca1d1b8
Fixed erroneous call to io.Fonts->ClearInputData() + ClearTexData() that was left in DX10 example but removed in 1.47 (Nov 2015) in every other back-ends. (fixes 6cee2fca94) ( #1733 , ~#1731) + assert
7 years ago
3a29ddbcfa
Version 1.60
7 years ago
82b7a39f31
Fixed a few zealous warnings.
7 years ago
1e116e6c17
Removed need for -Wnocast-qual on modern Clang/Xcode as a token of good behavior. Unfortunately the old stb_ decompress code is a little const clunky. + warning fix in stb_textedit which is already in master afaik.
7 years ago
78610a54d2
Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.
7 years ago
fe5347ef94
imconfig: Added IMGUI_STB_TRUETYPE_FILENAME, IMGUI_STB_RECT_PACK_FILENAME + documenting IMGUI_DISABLE_STB_XXX flags and hiding IMGUI_STB_NAMESPACE which is misleading.
...
Fixed typos in todo list.
7 years ago
1e296453ef
ImDrawList: Added Clone() helper function.
7 years ago
533c86a7a3
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
7 years ago
e7670c0bcc
Style: CloseButton() now display a proper cross. Using Button colors for background. Removed ImGuiCol_CloseButton, ImGuiCol_CloseButtonActive, ImGuiCol_CloseButtonHovered as the closing cross uses regular button colors now. ( #707 )
7 years ago
1f6ad7a894
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
7 years ago
a3d5f92214
Merge branch 'master' into font_offset
7 years ago
1ef1acbd8d
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
7 years ago
3dfac93ebe
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
7 years ago
945f4d1ecd
Removed redundant semi colons. ( #1653 )
7 years ago
0ec356eb6e
Comments, FAQ update.
7 years ago
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
403b2d7d59
ImDrawList: Better looking non-AA rectangle (lower-right corner and rounding). ( #1646 )
7 years ago
79969931e6
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
7 years ago
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
7 years ago
c433bbcd8e
ImFont: stb_truetype now rounding Ascent/Descent the same way as freetype does, they seem to vertically align better this way.
7 years ago
30c469f7c5
ImFont: DisplayOffset.y defaults to 0 instead of +1.
7 years ago
024e23c4d7
Comments, moved ImFontAtlas::Flags to "public" area.
7 years ago
fed0a884f7
ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. ( #1613 )
7 years ago
6bc3e7b043
ImFontAtlas: if stbtt_PackBegin() because of failing allocation we return a little more nicely. (keeps Coverity static analyzer happy!)
7 years ago
88dcbeb7ff
Styles: Comments and re-ordered.
7 years ago
7c16d52f72
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch ( #1565 , #787 )
7 years ago
47e81a6194
Merge branch 'master' into navigation
7 years ago
cd3dd886de
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ ( #1569 )
7 years ago
ed088b00be
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). ( #787 , #707 )
7 years ago
9edf211c0e
Merge branch 'master' into navigation
7 years ago
5eb293c879
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
7 years ago
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ( #939 )
7 years ago
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
ecbfdd3143
Added extraneous initialization to NULL. ( #1527 ).
7 years ago
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
856ee17ed8
Fixed Android clang warning.
7 years ago
7e03ee8d85
Merge branch 'master' into navigation
7 years ago
4af84ac781
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. ( #1527 )
7 years ago
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
e916310b2e
Version 1.53
7 years ago
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
cead207535
Comments
7 years ago
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
d976e4ea23
Internals: Missing IM_DELETE usage ( #1517 )
7 years ago
9cda86d55a
Internals: Added IM_NEW, IM_DELETE helper macros ( #1517 , #484 , #504 )
7 years ago
983d8f5f8e
Various zealous warning fixes (Clang).
7 years ago
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
7 years ago
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
7 years ago
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
6d93011fdf
alloca fix to allow Clang with Microsoft CodeGen path
7 years ago
364251146b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
aea3fe41b9
Style: Tweaks Dark and Light styles. ( #707 )
7 years ago
f5c47faee8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
1b2ec35b8d
Update imgui_draw.cpp
7 years ago
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
7 years ago
31683cfe34
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )
7 years ago
79f07f6ff0
Add AddImageRounded() to ImDrawList
7 years ago
8b2d449b16
Add ShadeVertsLinearUV()
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
f7fe824805
Style: Tweaked border settings to homogenize a little how they look over different backgrounds. ( #707 )
7 years ago
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
7 years ago
022f8c2342
fixed incomplete replacement of unsigned short with ImWchar in interface of ImFont::FindGlyph
7 years ago
9289e8055c
Merge pull request #1445 from franciscod/uninitialized_o3_werror
...
ImFontAtlas: Fix maybe-uninitialized warning.
7 years ago
d323e8cca2
Fixed Style merge for nav branch ( #707 , #787 )
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
0e4f1df1a4
Style: Made changes to Classic style (!!!). Tweaked Dark style. ( #707 )
7 years ago
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
7 years ago
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
7 years ago
331eac511e
Style: Dark: Tweaks + setting BorderShadow correctly.
7 years ago
f5871c0b92
fix uninitialized atlas packing context
7 years ago
6817f3a3d9
Merge branch 'master' into navigation
7 years ago
f5bdf443c9
Minor comments, tweaks
7 years ago
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
2a3a25e792
Reordered fields in other Style functions ( #1409 )
7 years ago
db190c16f6
Update imgui_draw.cpp
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
53f9e28c77
GetGlyphRangesThai(): removed extraneous codepoints ( #1396 )
7 years ago
3185a3a697
Add missing thai punctuations
7 years ago
d55b69ad6e
Styles: Nav tweaks.
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
9f200d10d5
Version 1.52
7 years ago
bc447bc0a4
ImFontAtlas: Fixed memory leak if stbtt_InitFont() returned false. ( #1391 )
7 years ago
7f880674e5
Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ( #1349 )
7 years ago
08e411c310
Merge branch 'atlas_build_clear_font' of https://github.com/inolen/imgui into inolen-atlas_build_clear_font
7 years ago
5b699517d4
Internals: PaintVerts** renamed to ShadeVerts**, moved to imgui_draw.cpp and exposed in imgui_internal.h (+1 squashed commits)
7 years ago
e32569dd5a
ImDrawList: Fixed a bug in ChannelsMerge() leading to an extraneous draw call being created, which unexpectly led to more dramatic condition but to faulty draw command merging code. ( #1172 , #1368 )
7 years ago
7a8eb5bdc9
Rendering issue fix
...
Fixes ocornut/imgui#1172
7 years ago
c38526d14b
Completely clear font when rebuilding atlas.
...
Previously, IndexLookup was not cleared on each font, causing FindGlyph to return old glyphs when using MergeMode.
7 years ago
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
7 years ago
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
7 years ago
9e1ad7295f
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
7 years ago
10bb9524eb
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
7 years ago
072d6d8cb5
ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited)
7 years ago
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
7 years ago
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
7 years ago
ba12d37719
Merge pull request #1324 from waywardmonkeys/improve-clang-warnings
...
FIxes zealous Clang warning.
7 years ago
709653c330
Merge branch 'master' into styles
7 years ago
4c794be41d
Improve warning configuration for clang.
...
Clang 4.0 introduced -Wdouble-promotion, so check for and disable
that on clang as we do on gcc.
The old style casts warning is already disabled globally in this file
for clang, so it doesn't need to be re-disabled within this scope.
7 years ago
65632d2682
Fixed alloca include for SunOS ( #1319 )
7 years ago
cf6ba9dd2d
Don't do a bunch of OS gymnastics. alloca.h is only for glibc, everyone else uses stdlib.h
7 years ago
0ba3cadb88
RenderRectFilledRangeH() can't use cheap acosf() approximation for now. ( #1296 )
7 years ago
01d4bf299a
Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. ( #1296 , #76 )
7 years ago
f0fa17b5e0
ImDrawList: Minor renaming
7 years ago
808d631e35
imDrawList: PathArcTo() returns when passed zero radius.
7 years ago
e1d81f4dc5
ImDrawList: Minor tidying up.
7 years ago
1f51e8f39d
Internals: Renamed some ImGuiCorner enums.
7 years ago
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
7 years ago
304de0ee1b
ImFontConfig: Comments, const.
7 years ago
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
8 years ago
1065a7b95b
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
8 years ago
8be7a60f20
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
8 years ago
1086c87767
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ( #618 )
8 years ago
4075cc58e9
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ( #618 )
8 years ago
d970957e2d
ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)
8 years ago
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
8 years ago
4a7e1ff4d4
ImFontAtlas: Some shallow renaming + added an assert for clarification
8 years ago
0be4f66d89
ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618 )
8 years ago
9239e91dc9
Whitespace fix to previous
8 years ago
718f00d651
Make font atlas packing padding configurable
8 years ago
18b50f8eba
Comments
8 years ago
f8f382221c
ImVector: added resize() variant with initialization value
8 years ago
7b7845d764
ImFont::CalcWordWrapPositionA: minor optimization
8 years ago
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
8 years ago
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
8 years ago
6a4064e5f2
PathArcToFast: Minor renaming for clarification. Comments.
8 years ago
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
8 years ago
e63ebd997f
Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
8 years ago
df56879883
imDrawList::PathRect() uses ImGuiCorner_ enums. Should fully promote this to imgui.h at some point.
8 years ago
1987e23ce5
ImDrawList::PrimReserve() minor renaming of locals to make things clearer
8 years ago
afae9398cb
Comments. Removed sort-of duplicate access to GImGui->Font in ImDrawList::AddText() so it's only in one place.
8 years ago
12d265fa31
Version 1.51 WIP tag
8 years ago
a2f7c40e30
Fixed comment ( #1178 )
8 years ago
5e1caaaef3
Version 1.50
8 years ago
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
8 years ago
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
8 years ago
0828a1fd6c
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
8 years ago
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
8 years ago
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
8 years ago
659b3fd259
Add ImDrawList::AddImageQuad
...
Adds a function
AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
8 years ago
670775ac22
Added assert/comment about using MergeMode ( #1100 )
8 years ago
e10ceebd36
ImFont: Store the texture surface used to get an idea of how costly each font is.
8 years ago
b84eac53d8
ImFont: Reorder field initialization to match declaration order
8 years ago
b8043d3ee5
Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ( #917 )
8 years ago
68df09cf47
Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)
8 years ago
66c4281290
Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack.
8 years ago
8553bab241
Ignoring overzealous GCC warnings ( #883 )
8 years ago
620497e466
Font: Font name include size
8 years ago
b2f0ea6c0d
Font: Default font given explicit name "ProggyClean.ttf"
8 years ago
907dd2ed20
Comments ( #896 )
8 years ago
d567595dde
ImDrawList: AddRect(), PathRect() default rounded_corner 0x0F->~0/-1 so it appears less obscure in IDE completions
8 years ago
e07d45709f
ImDrawList: Uses IM_COL32_A_MASK macro instead of hardcoded zero alpha testing ( #844 )
8 years ago
1d7e05327b
Fix clang warning: unknown warning group '-Wreserved-id-macro'
8 years ago
68c81739bf
Minor tidying up following merge BGRA color PR ( #844 )
8 years ago
1999c01db8
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
8 years ago
35c6fd682f
Inhibiting a ??e sequence in the embedded font. Shouldn't be treated as a trigraph but consistent with encoder ( #839 )
8 years ago
87d99fce6b
ImFont: CalcWordWrapPositionA() fixed font scaling with fallback character. (followup to 86666489df)
8 years ago
5a47346f5a
ImFont: add RenderGlyph() to allow rendering of individual glyphs
8 years ago
8efd05a148
Tab->Spaces, missing spaces, typos
9 years ago
4141144b21
Added GetGlyphRangesThai()
9 years ago
4961b2ea18
Speculative build fix for FreeBSD+GLIBC configuration
...
See
a1f9b62dd0
9 years ago
d79186931e
ImDrawList: Fixed a (rarely occuring) bug with merging with previous command + unnecessary OverlayDrawList command
9 years ago
65a525550e
ImFont: Allowing to use up to 0xFFFE glyphs in same font (increased from previous 0x8000)
9 years ago
5d4cf1c3f3
Version 1.50 WIP
9 years ago
adb85d800d
Version 1.49
9 years ago
b4302187dd
ImFontAtlas: Tweak to allow MergeMode to apply on a font that isn't the previous one, by setting the DstFont field.
9 years ago
a59a04f4d0
Fixed iOS/OSX build.
9 years ago
8af76d56b4
Merge pull request #639 from sergof/conversion-warnings
...
Ignore various anal GCC warnings.
9 years ago
8b428e8c74
Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() ( #586 , #269 )
9 years ago
6e8579fc14
Ignore implicit conversion warnings
9 years ago
f22b6e1e09
Fixed/silenced various absurd GCC warnings from outer space ( #626 )
9 years ago
79ad22e1f2
Fixed various Clang -Weverything warnings ( #626 )
9 years ago
7406d64c64
PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582 )
9 years ago
ea6b615179
Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ( #610 )
9 years ago
4b6e9ac396
ImFont: Added AddRemapChar() helper ( #609 )
9 years ago
727ca4bd17
ImFont: IndexLookup stores short instead of int, so typical ascii-set lookup fits in 256 bytes
9 years ago
a20d69f9ce
ImFont: Tweaking layout, shaving bit of alignment and simple hot/cot split
9 years ago
44fb99542f
ImFont: RenderText() useful directly without ImDrawList::AddText().. Changed prototype. Reserving vertices after skipping non-visible lead.
9 years ago
fe73a23cf5
ImFont: Added RenderChar() helper.
9 years ago
d92f1deff8
ImDrawList: Added AddQuad(), AddQuadFilled() helpers.
9 years ago
d5eb87d0a2
Fix font config propagation in FontFromMemoryCompressedTTF()
9 years ago
1588eda1ac
Version 1.49 WIP
9 years ago
95cbcdca3f
Version 1.48
9 years ago
39c9bb73e8
Merge pull request #563 from mneumann/fix_dragonfly
...
Fix compilation on DragonFly BSD
9 years ago
2b7eeba143
Trim trailing spaces
9 years ago
adb4d4d48b
Fix compilation on DragonFly BSD
9 years ago
5bed7144fe
ImDrawList: Added AddTriangle() function
9 years ago
9260d46c2c
Comments
9 years ago
b495a52fc0
ImDrawList: Allow AddText(ImFont* font, float font_size, ...) to take NULL/0.0f as default
9 years ago
928832a5bc
Various tidying up / comments, moved columns functions declarations, no functional changes
9 years ago
omar
Sebastian Krzyszkowiak
Elias Daler
ice1000
Tommy Nguyen
Rokas Kupstys
Aiekick
Branimir Karadžić
Giuseppe Barbieri
thedmd
Jason Wilkins
omar
Francisco Demartino
Adisorn Aeksatean
Dominik Tugend
Anthony Pesch
Bruce Mitchener
Daniel Loffgren
James Wallis
Peter
Geoffrey Tucker
Jeongseok Lee
Brian Swetland
Sergej Reich
Michael Neumann