Commit Graph

5348 Commits (5ef7445d922fd9fb5c59bedf2dada2926a4100e0)
 

Author SHA1 Message Date
omar 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ()
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
#	imgui.cpp
#	imgui.h
omar b4eeb4aa8d Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
omar af2db53780 Added GetStyleColorVec4()
omar cf84650ee8 GCC warnings fixes
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.
omar 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
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.)
omar 3b11e73333 Examples: gitignore added patterns for modern MSVC versions
omar bf0d9c123e Merge branch 'master' into navigation
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ()
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ()
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ()
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)
omar 24a78767d2 Merge branch 'master' into styles
# Conflicts:
#	TODO.txt
omar 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification
omar 52f1a4124c Demo: Tweaked Fonts section.
omar c569676a7b ImVector: Added a const
omar 0be4f66d89 ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like )
omar 34d09f2dc8 Merge pull request from onqtam/imgui_api
Added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
Viktor Kirilov fd9460a087 added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
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
omar a85a14370b OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
omar a9915681eb PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) ()
omar 5ea1865fdb (api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
omar 638d77c682 Comments ()
omar e8dd435ccd Merge branch 'mkeeter-is-popup-open'
omar d2259f65e5 Undo part of 32dbe836d0 to keep the same name for both overloads (, )
omar f98376d02b Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
# Conflicts:
#	imgui.cpp
omar a83f7083ed BeginPopupEx() uses ImGuiID internally
omar e682362f35 TODO list update, comments
omar f827c8448a Merge pull request from jadwallis/master
ImFontAtlas: Make font atlas padding between packed glyphs configurable
James Wallis 9239e91dc9 Whitespace fix to previous
James Wallis 718f00d651 Make font atlas packing padding configurable
omar 1e162dfc74 PushStyleVar/PopStyleVar: internal tweaks
omar 18f217e631 Style: Moved position of ImGuiCol_TitleBgCollapsed
omar 5429bd892e ColorEdit4: Added "Copy as..." option in context menu ()
omar 668a4bf1bc Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
omar 0f935248e3 Combo, Inputint, InputFloat, ColorEdit4 all use the small size for little square
omar 18b50f8eba Comments
omar f8f382221c ImVector: added resize() variant with initialization value
omar 032c222d57 Merge branch 'master' into styles
omar 9bf5028fd3 Merge branch 'master' into navigation
omar 01b99bbe09 TODO list update
omar cd17af0d33 Renamed
omar 03aae93f3e TODO list update (merging a first batch of things I had laying around, +60 entries)
omar 7b7845d764 ImFont::CalcWordWrapPositionA: minor optimization
omar a6d69f04c0 PlotHistogram: bars are drawn based on the position of zero ()
omar d258287c92 Revert d2c219d + tidying up ImFont::RenderChar()
omar 3d6e037c23 Comments ()