Commit Graph

5971 Commits (041ef01b33f5aa2e40fb466682eb9c5df0d8512d)
 

Author SHA1 Message Date
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 ()
omar bd3dfc0eba Moved TODO list to TODO.txt
omar d2c219df84 Merge pull request from swetland/patch
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
omar c26b29b254 Style: Moving code in a function to make incoming diff easier to parse.
omar 2b7fe73a08 Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (, )
omar c1e1e015c4 Style: Tweaked default border (which is off by default) to be less noticeable (, )
omar 97fccbdb73 Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
omar 648f75b245 Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (, )
omar 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments.
omar 8c61a4eb4c Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
omar 41076188ca Merge pull request from luk1337/master
ColorPicker: Fix broken ImGuiColorEditFlags_NoAlpha flag check - not restoring Alpha when clicking on reference color.
LuK1337 8352d43a0c Fix broken ImGuiColorEditFlags_NoAlpha flag check
* Fixes warning:
  imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
omar 908b025c3c Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation () + minor FAQ tweaks
omar 0f126a5b07 Update README.md (small wording bits, inspired by )
omar b4fe5d36a4 Examples: OpenGL3+SDL: Fix types to uses GlEnum ()
omar 048322f3fd Merge pull request from TinyTinni/master
Examples: OpenGL3+GLFW3: Fix types to uses GlEnum ()
omar 5eef7dd82f Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
omar 08265bfbd9 RenderArrow(): fix warning. re-orderer lines to match enum order.
omar e3fae56089 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
omar d7cad903aa Documentation tweaks
omar 73f9c9d80c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
omar 53d1b1e929 ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. ()
omar fed18d3203 Removed old ValueColor() helpers. ()
omar fc5ab0cb8d RenderCheckMark() tidying up
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc
omar 43e2abbee3 Comments, FAQ entry (, )
omar 55b99d753c Minor string typo