Commit Graph

5124 Commits (30d81f53cbdb73f88ab049d21fc7a00cf548c8c8)
 

Author SHA1 Message Date
omar bea06117bb Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. ()
omar ce7f3d4831 Merge branch 'master' into navigation
omar 444792f75f Merge fixes from ,master branch
ocornut 50b3a14d0a Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
omar 7de68fbe3d Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar d5b0d51274 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit
omar 9670fe9ca7 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
omar 6ee317d26d ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch.
omar 6c82af2b96 Navigation branch fix (we changed Clip)
omar 543dc2817f Fixed an assert when calling CloseCurrentPopup() twice in a row.
omar 53e73182ff Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
omar 530baee1a7 Removed tabs that slipped through the cracks
omar 9b484d24cd ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
omar 067127f113 Columns: Caching columns clipping rectangles ()
omar adeaf1cd72 Columns: Moved PushColumnClipRect() to imgui_internal.h
omar 54bdd00df7 Columns: Fix for explicit content width and scrollbar. (, )
omar ea493fd8da Merge branch 'ggtucker-master'
omar 83e8d10fab Columns: Columns set resize based on the presence of vertical scrollbar. Not 100% sure about that but it looks like we've fixed enough bugs that this may not cause troubles anymore. (, , , )
omar 1ebd7ec049 Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (, , )
omar 7ff1c149b5 Columns: Fixed another form of shearing made visible by the PreserveWidth option. The code was initially added in c46d5634d4 to fix because we've fixed in e42aaede42eb6d8a47cf104f3afd6057b13a61ee. (, )
omar 1c83b073c6 Columns: A set of column (and most importantly the right-most column) do not register its content to the parent, not affecting the window contents size. (, , )
omar 7f0063f858 Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (, )
omar e70d49ba1f Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (, )
omar 9307631c90 Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. (, ). End() calls EndColumns() directly.
omar a511b00226 Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. (, )
omar 3bf2af23e6 Columns: Fixed EndColumns() not repositioning the cursor. ()
omar 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ()
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
#	imgui.cpp
#	imgui.h
omar b4eeb4aa8d Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
omar af2db53780 Added GetStyleColorVec4()
omar cf84650ee8 GCC warnings fixes
omar fd394e1e95 Scrollbar: Comments. Fixed potential div-by-zero error which I can repro now, so added an assert to notify us if it's actually ever useful or not.
omar 1065a7b95b ImFontAtlas::AddFontDefault: Made it possible to override size (even if it isn't really recommended)
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.)
omar 3b11e73333 Examples: gitignore added patterns for modern MSVC versions
omar bf0d9c123e Merge branch 'master' into navigation
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ()
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. ()
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype ()
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)
omar 24a78767d2 Merge branch 'master' into styles
# Conflicts:
#	TODO.txt
omar 4a7e1ff4d4 ImFontAtlas: Some shallow renaming + added an assert for clarification
omar 52f1a4124c Demo: Tweaked Fonts section.
omar c569676a7b ImVector: Added a const
omar 0be4f66d89 ImFontAtlas: Shuffling some code inside Build() to make upcoming diffs less confusing (nb: we might break compat with forks of Build() like )
omar 34d09f2dc8 Merge pull request from onqtam/imgui_api
Added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
Viktor Kirilov fd9460a087 added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
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
omar a85a14370b OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
omar a9915681eb PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) ()