Commit Graph

5131 Commits (56ba60ee68417c44b3fc3835868c80acb5604e2f)
 

Author SHA1 Message Date
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) ()
omar d762f1dbfb Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). ()
omar 95f2706d1c Clipboard: [windows] Fixed not closing win32 clipboard on early return. ()
omar 40ac84d701 DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. ()
omar f6460970c5 ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ()
omar fb54dce71c Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
omar 1a26d0bc98 Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
omar 72da4081f8 Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
omar 2f508c7073 ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). ()
omar 10ef5a63f0 ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. ()
omar cc3cce7567 Comments, minor tidying up.
omar e63ebd997f Use ~IM_COL32_A_MASK instead of IM_COL32(255,255,255,0)
omar 70ee41b8b3 ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. ()
omar 4b2f157fb1 Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ()
omar efbb1ae04e ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. ()
omar 3ee969c3e3 ColorPicker: Alpha bar using a checkerboard. ()
omar 3075d8bcd4 ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). ()
omar f6a89779c8 ColorEdit4: Hex input clamps integer components to 0..255 range during printout ()