805 Commits (059e838b2ce60f641229b402f27362c8f41b1755)

Author SHA1 Message Date
omar 30d1e5712a Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
7 years ago
omar 942cb0e1f2 Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346) 7 years ago
omar 03700ad15e Merge remote-tracking branch 'origin' into 2016-07-navigation 7 years ago
omar f4c0134f9f Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment (#346) 7 years ago
omar f6460970c5 ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346) 7 years ago
omar 4b2f157fb1 Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346) 7 years ago
omar 3075d8bcd4 ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346) 7 years ago
omar 65a27732d8 ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. (#346) 7 years ago
omar 90fcd4a829 Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346) 7 years ago
omar 3926bd08e1 ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346) 7 years ago
omar c36d59a42a ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. (#346) 7 years ago
omar 27e5b09af1 ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview (#346) 7 years ago
omar 6796e771fd ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again. 7 years ago
omar c84acf3f56 Comments 7 years ago
omar 95fe11b5bf Added GetColorU32(u32) variant that does the style alpha multiply without a floating point round trip. Not 100% sure about that before the signature may seem ambiguous? But also make using imgui+drawlist more consistent in end-user extensions. 7 years ago
omar f39cd61bf0 Reorder ImGuiColorEditFlags_ (#346) 7 years ago
omar 4f1f251bd2 ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. (#346) 7 years ago
omar 7b2d79cffd ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. (#346) 7 years ago
omar 790d0eb5be ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346) 7 years ago
omar 4355b2e422 ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments (#346) 7 years ago
omar 15be7e1a71 ColorPicker: new prototype for ColorButton() .Added _NoTooltip, _NoLabel flags. Changing _Alpha flag to _NoAlpha makes so much much sense and allow to revert default parameters to zero. ColorEdit4/Picker4 don't attempt to read/write fourth component, making ColorEdit3/Picker3 shorter/faster. Tooltip and Picker called from ColorEdit can have a title. Picker shows colored square. Moved ColorTooltip() to imgui_internal.h (#346) 7 years ago
omar dd9c2f97a8 ColorPicker: Renamed _NoSliders to _NoInputs (#346) 7 years ago
omar c8553817d9 Merge branch 'master' into 2016-02-colorpicker 7 years ago
omar 138a9dbaeb Tooltip: SetTooltip() is expanded immediately into a window, honoring current font / styling setting. Add internal mechanism to override tooltips (not exposed in BeginTooltip yet because bools are evil) (#862) 7 years ago
omar 25f3717a1c Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. (#1237) 7 years ago
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker 7 years ago
omar d1145e990d Comments tweak (#1231) 7 years ago
omar 41f944238b Comments about GlyphExtraSpacing (#1192) 7 years ago
omar 8261d9ff30 Comments (#1172, #1231) 7 years ago
omar 03e6bfe84a Comments 7 years ago
omar d3f4309491 Comments about ImGuiStyleVar enum (#1198) 7 years ago
omar 1e981f00e5 Comments 7 years ago
omar a5e0210902 Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. (#1184) 7 years ago
omar 12d265fa31 Version 1.51 WIP tag 7 years ago
omar 5e1caaaef3 Version 1.50 7 years ago
omar 2acbd1ac2d Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear 7 years ago
omar 62c4698a73 Further clarifications of the key indices passed to IsKeyXXX functions (#1159) 7 years ago
omar 8228dc20df Merge branch 'master' into 2016-07-navigation 7 years ago
omar c038339a4c Merge branch 'master' into 2015-02-colorpicker 7 years ago
omar 9da53bcecd ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change) 7 years ago
omar c5c77a3476 ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon. 7 years ago
omar 27b83a2cac Merge branch 'master' into 2016-07-navigation 8 years ago
omar 89b1497843 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar a0a6c8a2ef Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API) 8 years ago
omar 6517d68cdf ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK (#1009) 8 years ago
Peter 659b3fd259 Add ImDrawList::AddImageQuad
Adds a function
  AddImageQuad(user_texture_id, a, b, c, d, uva, uvb, uvc, uvd, col)
that shows a texture on a full quad. This allows showing arbitrary
rotations of a texture.
8 years ago
Mikulas Florek 7a37a1c3f6 do not export inline function, it causes problems on some compiers 8 years ago
Mikulas Florek 316555f9de missing API 8 years ago
omar 288dccd5a5 Merge branch 'master' into 2016-07-navigation 8 years ago
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is. 8 years ago