a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
5938f1ba61
Added IsMousePosValid() helper.
7 years ago
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
7 years ago
304de0ee1b
ImFontConfig: Comments, const.
7 years ago
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
7 years ago
37f3a718c6
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
7 years ago
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
7 years ago
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
7 years ago
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
7 years ago
2e35957a81
Undo reordering of ImGuiKey in Nav branch
7 years ago
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
7 years ago
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
8 years ago
9b484d24cd
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
8 years ago
a511b00226
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. ( #913 , #125 )
8 years ago
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
8 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
8 years ago
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
8 years ago
af2db53780
Added GetStyleColorVec4()
8 years ago
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.)
8 years ago
bf0d9c123e
Merge branch 'master' into navigation
8 years ago
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)
8 years ago
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
8 years ago
c569676a7b
ImVector: Added a const
8 years ago
fd9460a087
added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
8 years ago
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
8 years ago
a85a14370b
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
8 years ago
5ea1865fdb
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
8 years ago
638d77c682
Comments ( #402 )
8 years ago
f98376d02b
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
...
# Conflicts:
# imgui.cpp
8 years ago
9239e91dc9
Whitespace fix to previous
8 years ago
718f00d651
Make font atlas packing padding configurable
8 years ago
18f217e631
Style: Moved position of ImGuiCol_TitleBgCollapsed
8 years ago
f8f382221c
ImVector: added resize() variant with initialization value
8 years ago
9bf5028fd3
Merge branch 'master' into navigation
8 years ago
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
8 years ago
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
8 years ago
c26b29b254
Style: Moving code in a function to make incoming diff easier to parse.
8 years ago
648f75b245
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. ( #707 , #1019 )
8 years ago
8c61a4eb4c
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
8 years ago
e3fae56089
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
8 years ago
d7cad903aa
Documentation tweaks
8 years ago
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
8 years ago
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
8 years ago
fed18d3203
Removed old ValueColor() helpers. ( #346 )
8 years ago
4fd148f4f9
Added ImFontAtlas::GlyphRangesBuilder helper + doc
8 years ago
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
8 years ago
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
8 years ago
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
8 years ago
f4c0134f9f
Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment ( #346 )
8 years ago
f6460970c5
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ( #346 )
8 years ago
4b2f157fb1
Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ ( #346 )
8 years ago
3075d8bcd4
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). ( #346 )
8 years ago
65a27732d8
ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. ( #346 )
8 years ago
90fcd4a829
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview ( #346 )
8 years ago
3926bd08e1
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. ( #346 )
8 years ago
c36d59a42a
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. ( #346 )
8 years ago
27e5b09af1
ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview ( #346 )
8 years ago
6796e771fd
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag ( #346 ). Reorder flags again.
8 years ago
c84acf3f56
Comments
8 years ago
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.
8 years ago
f39cd61bf0
Reorder ImGuiColorEditFlags_ ( #346 )
8 years ago
4f1f251bd2
ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. ( #346 )
8 years ago
7b2d79cffd
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. ( #346 )
8 years ago
790d0eb5be
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option ( #346 )
8 years ago
4355b2e422
ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments ( #346 )
8 years ago
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 )
8 years ago
dd9c2f97a8
ColorPicker: Renamed _NoSliders to _NoInputs ( #346 )
8 years ago
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
8 years ago
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 )
8 years ago
25f3717a1c
Removed IsPosHoveringAnyWindow() which was severaly broken and misleading (most people want to use io.WantCaptureMouse). Added dummy function with assert for now. ( #1237 )
8 years ago
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
8 years ago
d1145e990d
Comments tweak ( #1231 )
8 years ago
41f944238b
Comments about GlyphExtraSpacing ( #1192 )
8 years ago
8261d9ff30
Comments ( #1172 , #1231 )
8 years ago
03e6bfe84a
Comments
8 years ago
d3f4309491
Comments about ImGuiStyleVar enum ( #1198 )
8 years ago
1e981f00e5
Comments
8 years ago
a5e0210902
Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. ( #1184 )
8 years ago
12d265fa31
Version 1.51 WIP tag
8 years ago
5e1caaaef3
Version 1.50
8 years ago
2acbd1ac2d
Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear
8 years ago
62c4698a73
Further clarifications of the key indices passed to IsKeyXXX functions ( #1159 )
8 years ago
8228dc20df
Merge branch 'master' into 2016-07-navigation
8 years ago
c038339a4c
Merge branch 'master' into 2015-02-colorpicker
8 years ago
9da53bcecd
ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change)
8 years ago
c5c77a3476
ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon.
8 years ago
27b83a2cac
Merge branch 'master' into 2016-07-navigation
8 years ago
89b1497843
Merge branch 'master' into 2016-02-colorpicker
8 years ago
a0a6c8a2ef
Renamed ImDrawList::PathFill() to ImDrawList::PathFillConvex() for clarity. (breaking API)
8 years ago
6517d68cdf
ImDrawList::AddImage* renamed uv_ parameters to be more consistent. Fix AddImageQuad to use IM_COL32_A_MASK ( #1009 )
8 years ago
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
7a37a1c3f6
do not export inline function, it causes problems on some compiers
8 years ago
316555f9de
missing API
8 years ago
288dccd5a5
Merge branch 'master' into 2016-07-navigation
8 years ago
omar
Viktor Kirilov
James Wallis
omar
Peter
Mikulas Florek