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
|
a848807847
|
Minor inconsequential merges from Master/Docking branches
|
2018-09-05 11:51:45 +02:00 |
|
omar
|
bdb30d7145
|
Merge branch 'master' into viewport
|
2018-09-05 11:08:57 +02:00 |
|
omar
|
bcb1441ce7
|
Version 1.65 WIP
|
2018-09-03 14:38:04 +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
|
6c34bffbb5
|
Version 1.64 WIP
|
2018-08-30 19:00:22 +02:00 |
|
omar
|
f2aa124eb8
|
Version 1.64 WIP
|
2018-08-30 14:25:23 +02:00 |
|
omar
|
36b2f64051
|
Merge branch 'master' into viewport
# Conflicts:
# examples/example_glfw_opengl3/main.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_internal.h
|
2018-08-29 17:40:52 +02:00 |
|
omar
|
9e0f24dcb6
|
Version 1.63
|
2018-08-29 16:20:25 +02:00 |
|
omar
|
92edb7a4e3
|
Internals: Tidying up, moving helpers to imgui_internal.h (in prevision of 1.64 refactor)
|
2018-08-29 16:12:54 +02:00 |
|
omar
|
f81caac459
|
Merge branch 'master' into viewport
# Conflicts:
# imgui.cpp
# imgui.h
|
2018-08-25 21:19:42 +02:00 |
|
omar
|
a082692b0a
|
ImFontAtlas Comments (#2042) + added ImGuiFontAtlas_None for consistency.
|
2018-08-25 20:06:17 +02:00 |
|
omar
|
a4191857c1
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_vulkan.h
# imgui.cpp
|
2018-08-22 21:35:44 +02:00 |
|
omar
|
68448c5faa
|
ImDrawList: Large text passed to AddText() are being scanned for their end in order to avoid pre-reserving too many vertices.
|
2018-08-22 12:46:47 +02:00 |
|
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!)
|
2018-08-22 12:46:47 +02:00 |
|
omar
|
e5f2295398
|
Merge branch 'master' into viewport
# Conflicts:
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2018-08-13 17:50:48 -07:00 |
|
omar
|
fda9dc8e18
|
Internals: Extracted RenderMouseCursor() out of EndFrame(). Moved to imgui_draw.cpp along with RenderArrowPointingAt(). Comments. (#2013)
|
2018-08-09 18:07:49 +02:00 |
|
omar
|
4d5dcdb57a
|
Internals: Changed signature of ShadeVerts functions to remove pointers. (#1286, #1700, #1986)
|
2018-07-30 17:24:04 +02:00 |
|
Tommy Nguyen
|
b5b972d0ef
|
ImFontAtlas::AddFontDefault: Made it possible to override glyph ranges. (#1965)
|
2018-07-30 14:18:20 +02:00 |
|
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
|
2018-07-27 12:39:42 +02:00 |
|
omar
|
4ebd442a24
|
Added asserts to catch illegal modifications of the font atlas between NewFrame() and EndFrame()/Render(). (#1958)
|
2018-07-22 18:53:27 +02:00 |
|
Rokas Kupstys
|
7e59eb026b
|
Fix warning when IMGUI_DEFINE_MATH_OPERATORS is already defined by build system. (#1950)
|
2018-07-17 17:17:56 +02:00 |
|
omar
|
5e73e969fb
|
Comments, exposed a few things in imgui_internal.h for consistency, added ImQsort wrapper.
|
2018-07-12 11:08:24 +02:00 |
|
omar
|
23288547ec
|
Revert part of c7016c2 incorrectly renaming ImGuiCol_NavWindowingHighlight to ImGuiCol_NavWindowListHighlight, that was wholly unnecessary (and not documented!). (also invalidate #1939)
|
2018-07-12 09:53:10 +02:00 |
|
omar
|
c7016c25e8
|
Nav: Added a CTRL+TAB window list and changed the highlight system accordingly. (#787)
|
2018-07-09 19:16:48 +02:00 |
|
omar
|
93950b8c32
|
Internals: Removed unused ShadeVertsLinearAlphaGradientForLeftToRightText code.
|
2018-07-06 15:50:07 +02:00 |
|
omar
|
645ab6633c
|
Fixed a include build issue for Cygwin in non-POSIX (Win32) mode. (#1917, #1319, #276)
|
2018-07-01 12:25:37 +02:00 |
|
omar
|
6e67afc500
|
Tweaked software mouse cursor offset to match the offset of the corresponding Windows 10 cursors. (followup to #1914)
|
2018-06-29 16:36:40 +02:00 |
|
omar
|
62b3d7c51e
|
Fixed software Hand cursor from not actually working. Fixed demo from crashing. Fixed typo and extraneous trailing space. Added Changelogs. (#1913, #1914)
|
2018-06-29 16:36:40 +02:00 |
|
Aiekick
|
ecd9a223e3
|
add hand cursor support (+11 squashed commit)
|
2018-06-29 16:36:40 +02:00 |
|
omar
|
c1d8dee6c5
|
Version 1.63 WIP
|
2018-06-25 09:40:09 +02:00 |
|
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!).
|
2018-06-25 09:32:55 +02:00 |
|
omar
|
1b74e3be02
|
Version 1.62
|
2018-06-22 09:41:25 +02:00 |
|
omar
|
f5bf9f509c
|
ImFontConfig: Added GlyphMinAdvanceX/GlyphMaxAdvanceX settings useful to make a font appears monospaced, particularly useful for icon fonts. (#1869)
|
2018-06-08 12:52:46 +02:00 |
|
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.
|
2018-06-06 12:35:36 +02:00 |
|
omar
|
6c684ae39b
|
Fixed GCC pre-8 build. (#1822) + added bonus the non-ASCII character pasted from GCC breaks my SourceTree/Git combo
|
2018-05-17 18:10:20 +02:00 |
|
omar
|
64b1645deb
|
Disabled GCC 8.1.0 warnings -Wclass-memaccess (#1822)
|
2018-05-17 14:19:20 +02:00 |
|
omar
|
d5c8f404b2
|
Remove trailing white spaces.
|
2018-05-17 14:12:37 +02:00 |
|
omar
|
036dce634e
|
Version 1.62 WIP
|
2018-05-14 19:19:19 +02:00 |
|
omar
|
78b28d545f
|
Version 1.61 + todo additions
|
2018-05-14 12:34:47 +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
|
8149408408
|
Merge branch 'data_types'
# Conflicts:
# CHANGELOG.txt
# imgui.cpp
|
2018-05-11 16:48:50 +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
|
0bf43b3a1b
|
Settings: Added LoadIniSettingsFromDisk(), LoadIniSettingsFromMemory(), SaveIniSettingsToDisk(), SaveIniSettingsToMemory(), io.WantSaveIniSettings. (#923, #993)
|
2018-05-07 22:18:45 +02:00 |
|
omar
|
6eda9ed3fb
|
Skip missing font glyphs V2 revert changes to stb_truetype.h (
|
2018-05-07 19:57:53 +02:00 |
|
omar
|
a62f195e83
|
Internals: Renamed IsCharIsSpace() to IsCharIsBlank*() to match standard terminlogy and added ascii/u16 variations.
|
2018-05-03 17:33:55 +02:00 |
|
omar
|
28edece04f
|
Comments, minor tweaks
|
2018-04-27 17:32:03 +02:00 |
|
omar
|
928a4ad315
|
Begin: moved tooltip position code in an else block. Misc comments
|
2018-04-10 16:51:16 +02:00 |
|
omar
|
6f1f5cbc20
|
Version 1.61 WIP
|
2018-04-09 14:02:32 +02:00 |
|
omar
|
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
|
2018-04-09 13:13:06 +02:00 |
|
omar
|
3a29ddbcfa
|
Version 1.60
|
2018-04-08 00:45:02 +02:00 |
|
omar
|
82b7a39f31
|
Fixed a few zealous warnings.
|
2018-04-07 10:38:01 +02:00 |
|
omar
|
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.
|
2018-04-03 23:18:43 +02:00 |
|
omar
|
78610a54d2
|
Fixed Clang zealous cast-call warning (on par with GCC) which decided to warn against explicit C-style casts now.
|
2018-04-03 20:55:30 +02:00 |
|
omar
|
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.
|
2018-03-20 18:25:37 +01:00 |
|
omar
|
1e296453ef
|
ImDrawList: Added Clone() helper function.
|
2018-03-17 21:18:14 +01:00 |
|
omar
|
533c86a7a3
|
Update TODO list, minor fix in Readme, comments, Clang -Weverything warning fix in imgui_draw.cpp under Windows.
|
2018-03-17 17:29:58 +01:00 |
|
omar
|
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)
|
2018-03-12 11:48:04 +01:00 |
|
omar
|
1f6ad7a894
|
ImFont: Added FindGlyphNoFallback. Fixed MergeMode broken by 1ef1acbd8d
|
2018-03-10 10:33:12 +01:00 |
|
omar
|
a3d5f92214
|
Merge branch 'master' into font_offset
|
2018-03-08 16:49:39 +01:00 |
|
omar
|
1ef1acbd8d
|
Font: Fixed MergeMode adding duplicate glyphs data instead of reusing existing (broken by 072d6d8cb5)
|
2018-03-08 16:47:41 +01:00 |
|
omar
|
3dfac93ebe
|
Fonts: Fixed debug name not being zero-terminated if longer than storage buffer + made buffer slightly longer as well.
|
2018-03-08 15:58:56 +01:00 |
|
omar
|
945f4d1ecd
|
Removed redundant semi colons. (#1653)
|
2018-03-05 16:16:27 +01:00 |
|
omar
|
0ec356eb6e
|
Comments, FAQ update.
|
2018-03-05 13:05:47 +01:00 |
|
omar
|
69e700f869
|
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
|
2018-03-03 20:15:10 +01:00 |
|
omar
|
403b2d7d59
|
ImDrawList: Better looking non-AA rectangle (lower-right corner and rounding). (#1646)
|
2018-02-25 14:15:37 +01:00 |
|
omar
|
79969931e6
|
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
|
2018-02-23 00:01:34 +01:00 |
|
omar
|
7c75835200
|
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626)
|
2018-02-16 19:49:33 +01:00 |
|
omar
|
c433bbcd8e
|
ImFont: stb_truetype now rounding Ascent/Descent the same way as freetype does, they seem to vertically align better this way.
|
2018-02-15 10:47:20 +01:00 |
|
omar
|
30c469f7c5
|
ImFont: DisplayOffset.y defaults to 0 instead of +1.
|
2018-02-15 10:46:28 +01:00 |
|
omar
|
024e23c4d7
|
Comments, moved ImFontAtlas::Flags to "public" area.
|
2018-02-14 12:04:21 +01:00 |
|
omar
|
fed0a884f7
|
ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. (#1613)
|
2018-02-14 11:58:52 +01:00 |
|
omar
|
6bc3e7b043
|
ImFontAtlas: if stbtt_PackBegin() because of failing allocation we return a little more nicely. (keeps Coverity static analyzer happy!)
|
2018-02-13 21:57:15 +01:00 |
|
omar
|
88dcbeb7ff
|
Styles: Comments and re-ordered.
|
2018-02-08 21:14:57 +01:00 |
|
omar
|
7c16d52f72
|
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)
|
2018-02-06 20:20:34 +01:00 |
|
omar
|
47e81a6194
|
Merge branch 'master' into navigation
|
2018-01-31 16:00:25 +01:00 |
|
omar
|
cd3dd886de
|
Moved extra_fonts/ to misc/fonts/. Moved .natvis file to misc/natvis/ (#1569)
|
2018-01-31 16:00:07 +01:00 |
|
omar
|
ed088b00be
|
Nav: Style: Improved display of windowing highlight (for focus selection via PadMenu or Ctrl+TAB). (#787, #707)
|
2018-01-25 18:50:30 +01:00 |
|
omar
|
9edf211c0e
|
Merge branch 'master' into navigation
|
2018-01-21 20:46:50 +01:00 |
|
omar
|
5eb293c879
|
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
|
2018-01-20 20:32:23 +01:00 |
|
omar
|
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)
|
2018-01-20 20:25:12 +01:00 |
|
omar
|
66b2ee6ea2
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2018-01-07 14:25:05 +01:00 |
|
omar
|
ecbfdd3143
|
Added extraneous initialization to NULL. (#1527).
|
2018-01-04 11:06:12 +01:00 |
|
omar
|
96ccc484f9
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2018-01-03 12:33:27 +01:00 |
|
Branimir Karadžić
|
856ee17ed8
|
Fixed Android clang warning.
|
2018-01-03 10:29:37 +01:00 |
|
omar
|
7e03ee8d85
|
Merge branch 'master' into navigation
|
2018-01-02 17:21:49 +01:00 |
|
omar
|
4af84ac781
|
ImFontAtlas: Handle stb_truetype failure more gracefully, GetTexDataAsRGBA32() won't crash during conversion. (#1527)
|
2017-12-30 23:10:11 +01:00 |
|
omar
|
c4e6d622c1
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-12-29 13:39:07 +01:00 |
|
omar
|
49eed6e2d1
|
Version 1.54 WIP
|
2017-12-28 15:17:35 +01:00 |
|
omar
|
436cad4bca
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.h
|
2017-12-26 15:37:31 +01:00 |
|
omar
|
e916310b2e
|
Version 1.53
|
2017-12-25 17:41:41 +01:00 |
|
omar
|
de5c304b49
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-12-24 18:59:40 +01:00 |
|
omar
|
cead207535
|
Comments
|
2017-12-24 17:58:41 +01:00 |
|
omar
|
ffb4f6ca8c
|
Merge branch 'master' into navigation
|
2017-12-23 16:27:48 +01:00 |
|