Commit Graph

5348 Commits (5ef7445d922fd9fb5c59bedf2dada2926a4100e0)
 

Author SHA1 Message Date
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
omar 059e838b2c Merge branch 'master' into navigation
omar be9628494a Demo: Rearranged everything under Widgets in a more consistent way.
omar 453ad17a09 Merge branch 'master' into navigation
# Conflicts:
#	imgui_demo.cpp
omar d888de4483 Demo: Merged a few demo tweaks from navigation branch to minimize drift.
omar 30d1e5712a Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
omar a78ef7a369 Comments
omar 942cb0e1f2 Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ()
omar d952a8d3bf Demo: Color widget demo tweaks ()
omar a4012fd5b2 Merge branch 'master' into 2016-02-colorpicker
omar 23fae61109 Merge branch 'master' into 2016-07-navigation
# Conflicts:
#	imgui.cpp
omar b5ad88627d Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little
omar a1bcc8392e Fixed GetScrollMaxX() debug left-over from 7096fd8500 ()
omar 03700ad15e Merge remote-tracking branch 'origin' into 2016-07-navigation
omar 1c991b525a Merge remote-tracking branch 'origin' into 2016-02-colorpicker
omar 0ab722c3c5 Columns: First first column appearing wider than others ()
omar d43c25d8f4 SetScrollHere() tweak to make the code a little less confusing
omar e36b41cbd0 Fixed Y scroll aiming when Horizontal Scrollbar is enabled (). Tweak log demo.
omar 7096fd8500 Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. (, )
omar 233a6efeba Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). ()
omar 6d60e0fc58 Fonts readme tweaks, links
omar f4c0134f9f Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment ()
omar cdea8ca94f Demo: Comment about 'static' and some tweaks ()
omar 46c73cccff Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) ()