Benj
/
imgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,358 Commits
1 Branch
0 Tags
81 MiB
docking
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'cc78e9a213'
${ noResults }
Commit Graph

915 Commits (cc78e9a213d2413b997d1f4c41ffadf517b77967)

Author SHA1 Message Date
omar 709653c330 Merge branch 'master' into styles 7 years ago
omar 62d7fa4324 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar f63c03c464 Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch. 7 years ago
omar 5c4fda0fbc Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar 804ee78731 Added IsWindowAppearing(). 7 years ago
omar fd684ba974 Removed 2 obsolete redirection functions (obsoleted 26+ months ago). 7 years ago
omar a9e1d9aab9 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 7 years ago
omar 358e7a194e Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function. 7 years ago
omar ee42fae468 Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. (#787) 7 years ago
omar 807322c9a5 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 7 years ago
omar 5938f1ba61 Added IsMousePosValid() helper. 7 years ago
omar 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
omar 304de0ee1b ImFontConfig: Comments, const. 7 years ago
omar 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
omar 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
omar 40f608ce9b Version 1.52 WIP 7 years ago
omar 55a6209931 Version 1.51 7 years ago
omar 6ed75d3046 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
 7 years ago
omar eb2bbf6f29 Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav. 7 years ago
omar 52b39af0a0 Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245) 7 years ago
omar 6be7d4904e Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function. 7 years ago
omar 2e35957a81 Undo reordering of ImGuiKey in Nav branch 7 years ago
ocornut 50b3a14d0a Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h 7 years ago
omar 53e73182ff Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 8 years ago
omar 9b484d24cd ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments. 8 years ago
omar a511b00226 Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (#913, #125) 8 years ago
omar 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125) 8 years ago
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master 
# Conflicts:
#	imgui.cpp
#	imgui.h
 8 years ago
omar b4eeb4aa8d Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section. 8 years ago
omar af2db53780 Added GetStyleColorVec4() 8 years ago
omar 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
omar bf0d9c123e Merge branch 'master' into navigation 8 years ago
omar 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
omar 24a78767d2 Merge branch 'master' into styles 
# Conflicts:
#	TODO.txt
 8 years ago
omar c569676a7b ImVector: Added a const 8 years ago
Viktor Kirilov fd9460a087 added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp 8 years ago
omar 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
omar a85a14370b OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier. 8 years ago
omar 5ea1865fdb (api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely. 8 years ago
omar 638d77c682 Comments (#402) 8 years ago
omar f98376d02b Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open 
# Conflicts:
#	imgui.cpp
 8 years ago
James Wallis 9239e91dc9 Whitespace fix to previous 8 years ago
James Wallis 718f00d651 Make font atlas packing padding configurable 8 years ago
omar 18f217e631 Style: Moved position of ImGuiCol_TitleBgCollapsed 8 years ago
omar f8f382221c ImVector: added resize() variant with initialization value 8 years ago
omar 9bf5028fd3 Merge branch 'master' into navigation 8 years ago
omar d258287c92 Revert d2c219d #826 + tidying up ImFont::RenderChar() 8 years ago
omar d2c219df84 Merge pull request #826 from swetland/patch 
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
 8 years ago
omar c26b29b254 Style: Moving code in a function to make incoming diff easier to parse. 8 years ago
omar 648f75b245 Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. (#707, #1019) 8 years ago
omar 8c61a4eb4c Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points) 8 years ago
omar e3fae56089 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
 8 years ago
omar d7cad903aa Documentation tweaks 8 years ago
omar 73f9c9d80c Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
 8 years ago
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS 8 years ago
omar fed18d3203 Removed old ValueColor() helpers. (#346) 8 years ago
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc 8 years ago
omar 30d1e5712a Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 8 years ago
omar 942cb0e1f2 Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346) 8 years ago
omar 03700ad15e Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
omar f4c0134f9f Moved ColorEdit, ColorPicker declaration in their own section of imgui.h, minor comments adjustment (#346) 8 years ago
omar f6460970c5 ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346) 8 years ago
omar 4b2f157fb1 Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346) 8 years ago
omar 3075d8bcd4 ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346) 8 years ago
omar 65a27732d8 ImGuiColorEditFlags: Made 0x01 unused for backward compatibility with old bool. Various comments tweaks. (#346) 8 years ago
omar 90fcd4a829 Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346) 8 years ago
omar 3926bd08e1 ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346) 8 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) 8 years ago
omar 27e5b09af1 ColorButton: ImGuiColorEditFlags_HalfAlphaPreview flag to render both opaque and alpha-with-checkerboard versions of the peak preview (#346) 8 years ago
omar 6796e771fd ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again. 8 years ago
omar c84acf3f56 Comments 8 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. 8 years ago
omar f39cd61bf0 Reorder ImGuiColorEditFlags_ (#346) 8 years ago
omar 4f1f251bd2 ColorEdit, ColorPicker: Context / options menu allows to toggle between u8 and float display. Using short words to avoid localization. (#346) 8 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) 8 years ago
omar 790d0eb5be ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346) 8 years ago
omar 4355b2e422 ColorPicker: Honor ImGuiColorEditFlags_NoColorSquare flag + comments (#346) 8 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) 8 years ago
omar dd9c2f97a8 ColorPicker: Renamed _NoSliders to _NoInputs (#346) 8 years ago
omar c8553817d9 Merge branch 'master' into 2016-02-colorpicker 8 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) 8 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) 8 years ago
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar d1145e990d Comments tweak (#1231) 8 years ago
omar 41f944238b Comments about GlyphExtraSpacing (#1192) 8 years ago
omar 8261d9ff30 Comments (#1172, #1231) 8 years ago
omar 03e6bfe84a Comments 8 years ago
omar d3f4309491 Comments about ImGuiStyleVar enum (#1198) 8 years ago
omar 1e981f00e5 Comments 8 years ago
omar a5e0210902 Revert 978c84d2e9 because int32 >> 32 tends to warns on some compilers/settings. Add ImU64 type. (#1184) 8 years ago
omar 12d265fa31 Version 1.51 WIP tag 8 years ago
omar 5e1caaaef3 Version 1.50 8 years ago
omar 2acbd1ac2d Using ImTextureID instead of void* in ImFontAtlas, not sure why I didn't do that earlier, make things more clear 8 years ago
omar 62c4698a73 Further clarifications of the key indices passed to IsKeyXXX functions (#1159) 8 years ago
omar 8228dc20df Merge branch 'master' into 2016-07-navigation 8 years ago
omar c038339a4c Merge branch 'master' into 2015-02-colorpicker 8 years ago
omar 9da53bcecd ImFontConfig: Removed MergeGlyphCenterV in favor of a more multipurpose ImFontConfig::GlyphOffset. (Breaking change) 8 years ago
omar c5c77a3476 ImFontConfig: Added GlyphOffset to explicitely offset glyphs at font build time, useful for merged fonts. May remove MergeGlyphCenterV soon. 8 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