omar
|
d2259f65e5
|
Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799)
|
2017-08-16 13:42:41 +08:00 |
|
omar
|
f98376d02b
|
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
# Conflicts:
# imgui.cpp
|
2017-08-16 13:19:15 +08:00 |
|
omar
|
a83f7083ed
|
BeginPopupEx() uses ImGuiID internally
|
2017-08-16 13:06:14 +08:00 |
|
omar
|
e682362f35
|
TODO list update, comments
|
2017-08-16 12:54:51 +08:00 |
|
omar
|
f827c8448a
|
Merge pull request #1282 from jadwallis/master
ImFontAtlas: Make font atlas padding between packed glyphs configurable
|
2017-08-16 10:45:07 +08:00 |
|
James Wallis
|
9239e91dc9
|
Whitespace fix to previous
|
2017-08-15 14:12:32 +01:00 |
|
James Wallis
|
718f00d651
|
Make font atlas packing padding configurable
|
2017-08-15 14:11:04 +01:00 |
|
omar
|
1e162dfc74
|
PushStyleVar/PopStyleVar: internal tweaks
|
2017-08-15 19:19:00 +08:00 |
|
omar
|
18f217e631
|
Style: Moved position of ImGuiCol_TitleBgCollapsed
|
2017-08-15 19:06:02 +08:00 |
|
omar
|
5429bd892e
|
ColorEdit4: Added "Copy as..." option in context menu (#346)
|
2017-08-15 18:30:52 +08:00 |
|
omar
|
668a4bf1bc
|
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
|
2017-08-15 17:48:41 +08:00 |
|
omar
|
0f935248e3
|
Combo, Inputint, InputFloat, ColorEdit4 all use the small size for little square
|
2017-08-15 17:46:11 +08:00 |
|
omar
|
18b50f8eba
|
Comments
|
2017-08-15 11:41:36 +08:00 |
|
omar
|
f8f382221c
|
ImVector: added resize() variant with initialization value
|
2017-08-15 11:41:00 +08:00 |
|
omar
|
032c222d57
|
Merge branch 'master' into styles
|
2017-08-15 10:52:38 +08:00 |
|
omar
|
9bf5028fd3
|
Merge branch 'master' into navigation
|
2017-08-15 00:50:59 +08:00 |
|
omar
|
01b99bbe09
|
TODO list update
|
2017-08-15 00:36:15 +08:00 |
|
omar
|
cd17af0d33
|
Renamed
|
2017-08-15 00:09:03 +08:00 |
|
omar
|
03aae93f3e
|
TODO list update (merging a first batch of things I had laying around, +60 entries)
|
2017-08-14 21:14:42 +08:00 |
|
omar
|
7b7845d764
|
ImFont::CalcWordWrapPositionA: minor optimization
|
2017-08-14 21:00:44 +08:00 |
|
omar
|
a6d69f04c0
|
PlotHistogram: bars are drawn based on the position of zero (#828)
|
2017-08-14 17:20:05 +08:00 |
|
omar
|
d258287c92
|
Revert d2c219d #826 + tidying up ImFont::RenderChar()
|
2017-08-14 16:53:38 +08:00 |
|
omar
|
3d6e037c23
|
Comments (#1034)
|
2017-08-14 16:51:14 +08:00 |
|
omar
|
bd3dfc0eba
|
Moved TODO list to TODO.txt
|
2017-08-14 16:51:14 +08:00 |
|
omar
|
d2c219df84
|
Merge pull request #826 from swetland/patch
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
|
2017-08-14 16:50:20 +08:00 |
|
omar
|
c26b29b254
|
Style: Moving code in a function to make incoming diff easier to parse.
|
2017-08-14 15:14:46 +08:00 |
|
omar
|
2b7fe73a08
|
Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (#1048, #1056)
|
2017-08-14 13:27:19 +08:00 |
|
omar
|
c1e1e015c4
|
Style: Tweaked default border (which is off by default) to be less noticeable (#707, #1019)
|
2017-08-14 13:07:55 +08:00 |
|
omar
|
97fccbdb73
|
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
|
2017-08-14 13:05:03 +08:00 |
|
omar
|
648f75b245
|
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019)
|
2017-08-14 13:04:32 +08:00 |
|
omar
|
6a4064e5f2
|
PathArcToFast: Minor renaming for clarification. Comments.
|
2017-08-14 12:25:35 +08:00 |
|
omar
|
8c61a4eb4c
|
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
|
2017-08-14 11:29:54 +08:00 |
|
omar
|
41076188ca
|
Merge pull request #1277 from luk1337/master
ColorPicker: Fix broken ImGuiColorEditFlags_NoAlpha flag check - not restoring Alpha when clicking on reference color.
|
2017-08-12 12:53:13 +08:00 |
|
LuK1337
|
8352d43a0c
|
Fix broken ImGuiColorEditFlags_NoAlpha flag check
* Fixes warning:
imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
|
2017-08-11 22:52:40 +02:00 |
|
omar
|
908b025c3c
|
Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks
|
2017-08-12 01:23:39 +08:00 |
|
omar
|
0f126a5b07
|
Update README.md (small wording bits, inspired by #1093)
|
2017-08-12 01:05:24 +08:00 |
|
omar
|
b4fe5d36a4
|
Examples: OpenGL3+SDL: Fix types to uses GlEnum (#1147)
|
2017-08-12 00:46:58 +08:00 |
|
omar
|
048322f3fd
|
Merge pull request #1147 from TinyTinni/master
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum (#1147)
|
2017-08-12 00:43:34 +08:00 |
|
omar
|
5eef7dd82f
|
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
|
2017-08-12 00:43:55 +08:00 |
|
omar
|
08265bfbd9
|
RenderArrow(): fix warning. re-orderer lines to match enum order.
|
2017-08-11 14:44:53 +08:00 |
|
omar
|
e3fae56089
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-08-11 14:30:17 +08:00 |
|
omar
|
d7cad903aa
|
Documentation tweaks
|
2017-08-11 14:29:27 +08:00 |
|
omar
|
73f9c9d80c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-08-11 13:44:25 +08:00 |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
2017-08-11 13:36:28 +08:00 |
|
omar
|
53d1b1e929
|
ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. (#346)
|
2017-08-10 10:25:50 +08:00 |
|
omar
|
fed18d3203
|
Removed old ValueColor() helpers. (#346)
|
2017-08-09 23:04:26 +08:00 |
|
omar
|
fc5ab0cb8d
|
RenderCheckMark() tidying up
|
2017-08-09 22:56:01 +08:00 |
|
omar
|
4fd148f4f9
|
Added ImFontAtlas::GlyphRangesBuilder helper + doc
|
2017-08-09 22:42:03 +08:00 |
|
omar
|
43e2abbee3
|
Comments, FAQ entry (#586, #1105)
|
2017-08-09 20:27:59 +08:00 |
|
omar
|
55b99d753c
|
Minor string typo
|
2017-08-08 23:12:23 +08:00 |
|