omar
|
3bf2af23e6
|
Columns: Fixed EndColumns() not repositioning the cursor. (#913)
|
2017-08-20 18:44:54 +08:00 |
|
omar
|
19a42cb2fd
|
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
|
2017-08-20 18:44:48 +08:00 |
|
omar
|
bc78535bbf
|
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-08-20 18:22:34 +08:00 |
|
omar
|
b4eeb4aa8d
|
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
|
2017-08-20 17:53:09 +08:00 |
|
omar
|
af2db53780
|
Added GetStyleColorVec4()
|
2017-08-20 17:50:25 +08:00 |
|
omar
|
cf84650ee8
|
GCC warnings fixes
|
2017-08-20 16:39:43 +08:00 |
|
omar
|
fd394e1e95
|
Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
|
2017-08-20 16:39:11 +08:00 |
|
omar
|
1065a7b95b
|
ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
|
2017-08-20 15:38:05 +08:00 |
|
omar
|
91d841dd5f
|
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
|
2017-08-20 15:28:12 +08:00 |
|
omar
|
3b11e73333
|
Examples: gitignore added patterns for modern MSVC versions
|
2017-08-20 15:17:37 +08:00 |
|
omar
|
8be7a60f20
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
2017-08-17 21:19:54 +08:00 |
|
omar
|
1086c87767
|
ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618)
|
2017-08-17 21:13:14 +08:00 |
|
omar
|
4075cc58e9
|
ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618)
|
2017-08-17 20:44:44 +08:00 |
|
omar
|
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)
|
2017-08-17 19:36:48 +08:00 |
|
omar
|
4a7e1ff4d4
|
ImFontAtlas: Some shallow renaming + added an assert for clarification
|
2017-08-17 15:35:59 +08:00 |
|
omar
|
52f1a4124c
|
Demo: Tweaked Fonts section.
|
2017-08-17 13:56:16 +08:00 |
|
omar
|
c569676a7b
|
ImVector: Added a const
|
2017-08-17 11:46:25 +08:00 |
|
omar
|
0be4f66d89
|
ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like #618)
|
2017-08-17 11:46:25 +08:00 |
|
omar
|
34d09f2dc8
|
Merge pull request #1283 from onqtam/imgui_api
Added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
|
2017-08-16 23:29:52 +08:00 |
|
Viktor Kirilov
|
fd9460a087
|
added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
|
2017-08-16 17:52:11 +03:00 |
|
omar
|
68bf5ecbc1
|
Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME
|
2017-08-16 17:51:44 +08:00 |
|
omar
|
a85a14370b
|
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
|
2017-08-16 15:47:10 +08:00 |
|
omar
|
a9915681eb
|
PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747)
|
2017-08-16 14:37:54 +08:00 |
|
omar
|
5ea1865fdb
|
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
|
2017-08-16 14:24:41 +08:00 |
|
omar
|
638d77c682
|
Comments (#402)
|
2017-08-16 14:19:48 +08:00 |
|
omar
|
e8dd435ccd
|
Merge branch 'mkeeter-is-popup-open'
|
2017-08-16 13:43:02 +08:00 |
|
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
|
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
|
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 |
|