omar
|
0c24fe276c
|
Merge branch 'master_164' into viewport_164
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
# imgui_widgets.cpp
|
6 years ago |
|
omar
|
48db5713d6
|
Version 1.64
|
6 years ago |
|
omar
|
38cfcf9fbc
|
Tweak comments and indexes
|
6 years ago |
|
omar
|
a58e4dfd0f
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
6 years ago |
|
omar
|
df37a156e8
|
Refactor: Moved Scrollbar function from imgui.cpp to imgui_widgets.cpp, added file index (#2036)
|
6 years ago |
|
omar
|
6c34bffbb5
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
f2aa124eb8
|
Version 1.64 WIP
|
6 years ago |
|
omar
|
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 |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
6 years ago |
|
omar
|
92edb7a4e3
|
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
|
6 years ago |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
6 years ago |
|
omar
|
a082692b0a
|
ImFontAtlas Comments (#2042) + added ImGuiFontAtlas_None for consistency.
|
6 years ago |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
6 years ago |
|
omar
|
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 |
|
omar
|
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 |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
7 years ago |
|
omar
|
fda9dc8e18
|
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. (#2013)
|
7 years ago |
|
omar
|
4d5dcdb57a
|
Internals: Changed signature of ShadeVerts functions to remove pointers. (#1286, #1700, #1986)
|
7 years ago |
Tommy Nguyen
|
b5b972d0ef
|
ImFontAtlas::AddFontDefault: Made it possible to override glyph ranges. (#1965)
|
7 years ago |
|
omar
|
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 |
|
omar
|
4ebd442a24
|
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958)
|
7 years ago |
Rokas Kupstys
|
7e59eb026b
|
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)
|
7 years ago |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
7 years ago |
|
omar
|
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 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
7 years ago |
|
omar
|
93950b8c32
|
Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code.
|
7 years ago |
|
omar
|
645ab6633c
|
Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276)
|
7 years ago |
|
omar
|
6e67afc500
|
Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. (followup to #1914)
|
7 years ago |
|
omar
|
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 |
Aiekick
|
ecd9a223e3
|
add hand cursor support (+11 squashed commit)
|
7 years ago |
|
omar
|
c1d8dee6c5
|
Version 1.63 WIP
|
7 years ago |
|
omar
|
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 |
|
omar
|
1b74e3be02
|
Version 1.62
|
7 years ago |
|
omar
|
f5bf9f509c
|
ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. (#1869)
|
7 years ago |
|
omar
|
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 |
|
omar
|
6c684ae39b
|
Fixed GCC pre-8 build. (#1822) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo
|
7 years ago |
|
omar
|
64b1645deb
|
Disabled GCC 8.1.0 warnings -Wclass-memaccess (#1822)
|
7 years ago |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
7 years ago |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
7 years ago |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
7 years ago |
|
omar
|
2a2bb8970d
|
Added ImAtof, ImCeil, ImFloorStd to IMGUI_DISABLE_MATH_FUNCTIONS for consistency. Configuration comments.
|
7 years ago |
|
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.
|
7 years ago |
|
omar
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
7 years ago |
|
omar
|
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 |
|
omar
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
7 years ago |
|
omar
|
6eda9ed3fb
|
Skip missing font glyphs V2 revert changes to stb_truetype.h (
|
7 years ago |
|
omar
|
a62f195e83
|
Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.
|
7 years ago |
|
omar
|
28edece04f
|
Comments, minor tweaks
|
7 years ago |
|
omar
|
928a4ad315
|
Begin: moved tooltip position code in an else block. Misc comments
|
7 years ago |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
7 years ago |