4541 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	bf0d9c123e	Merge branch 'master' into navigation	2017-08-18 00:25:12 +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	24a78767d2	Merge branch 'master' into styles ... # Conflicts: # TODO.txt	2017-08-17 17:24:33 +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	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