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

1992 Commits (6c91a1ef7fabbcb39d2188d57c947e66e9d79de8)

Author SHA1 Message Date
omar 92efa00bc9 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit 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 141339e4b7 (internals) Renamed FocusedWindow to NavWindow to match terminology of navigation branch 7 years ago
ocornut 2ad2190d47 Merge 20a0fde012 Tidying up default clipboard handler for non Windows-OS (from Nav branch) 7 years ago
omar f3ab5e6252 Fixed InputText() bug with ImGuiInputTextFlags_EnterReturnsTrue (in nav branch only) (#787). Thanks @Grouflon 7 years ago
omar bea06117bb Nav: Fix navigation inside child windows. Removed GetChildID() and storin/g the info within the window. (#1291) 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 d5b0d51274 Minor miscellaneous merges from Navigation branch to reduce divergence a little bit 7 years ago
omar 9670fe9ca7 Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
 7 years ago
omar 6ee317d26d ImRect::Clip() -> ClipWith() to clarify meaning, going to undo the change in Nav branch. 7 years ago
omar 6c82af2b96 Navigation branch fix (we changed Clip) 7 years ago
omar 543dc2817f Fixed an assert when calling CloseCurrentPopup() twice in a row. 8 years ago
omar 53e73182ff Merge branch 'master' into navigation 
# Conflicts:
#	imgui_internal.h
 8 years ago
omar 530baee1a7 Removed tabs that slipped through the cracks 8 years ago
omar 067127f113 Columns: Caching columns clipping rectangles (#125) 8 years ago
omar adeaf1cd72 Columns: Moved PushColumnClipRect() to imgui_internal.h 8 years ago
omar 54bdd00df7 Columns: Fix for explicit content width and scrollbar. (#519, #125) 8 years ago
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. (#125, #913, #893, #1138) 8 years ago
omar 1ebd7ec049 Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913) 8 years ago
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. (#913, #125) 8 years ago
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. (#519, #125, #913) 8 years ago
omar 7f0063f858 Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125) 8 years ago
omar e70d49ba1f Columns: Fixed one form of shearing during resizing columns with PreserveWidth enabled (there's another issue still). (#913, #125) 8 years ago
omar 9307631c90 Columns: Removed unnecessary/misleading dummy ItemSize(). Was fixed already before, and fixed again in this branch by 3bf2af23e6. (#913, #125). End() calls EndColumns() directly. 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 3bf2af23e6 Columns: Fixed EndColumns() not repositioning the cursor. (#913) 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 cf84650ee8 GCC warnings fixes 8 years ago
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. 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 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 a9915681eb PushID()/PopID() to not need to mark parent window as Accessed (needlessly waking up the root "Debug" window) (#747) 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 d2259f65e5 Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799) 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
omar a83f7083ed BeginPopupEx() uses ImGuiID internally 8 years ago
omar 9bf5028fd3 Merge branch 'master' into navigation 8 years ago
omar a6d69f04c0 PlotHistogram: bars are drawn based on the position of zero (#828) 8 years ago
omar 3d6e037c23 Comments (#1034) 8 years ago
omar bd3dfc0eba Moved TODO list to TODO.txt 8 years ago
omar 2b7fe73a08 Window size can be loaded from .ini data even if ImGuiWindowFlags_NoResize flag is set (#1048, #1056) 8 years ago
omar c1e1e015c4 Style: Tweaked default border (which is off by default) to be less noticeable (#707, #1019) 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 6a4064e5f2 PathArcToFast: Minor renaming for clarification. Comments. 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
LuK1337 8352d43a0c Fix broken ImGuiColorEditFlags_NoAlpha flag check 
* Fixes warning:
  imgui.cpp:9295:98: warning: enum constant in boolean context [-Wint-in-bool-context]
 8 years ago
omar 908b025c3c Fixed (unlikely) Ini saving crash if the ImGuiWindowFlags_NoSavedSettings gets removed from a window after its creation (#1000) + minor FAQ tweaks 8 years ago
omar 08265bfbd9 RenderArrow(): fix warning. re-orderer lines to match enum order. 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 53d1b1e929 ColorPicker: Fixes for when ImGuiColorEditFlags_NoOptions flag is set: always read a default picker type + forward flag to sub ColorEdit widgets. (#346) 8 years ago
omar fed18d3203 Removed old ValueColor() helpers. (#346) 8 years ago
omar fc5ab0cb8d RenderCheckMark() tidying up 8 years ago
omar 4fd148f4f9 Added ImFontAtlas::GlyphRangesBuilder helper + doc 8 years ago
omar 43e2abbee3 Comments, FAQ entry (#586, #1105) 8 years ago
omar 55b99d753c Minor string typo 8 years ago
omar 30d1e5712a Merge branch 'master' into navigation 
# Conflicts:
#	imgui.cpp
#	imgui.h
#	imgui_internal.h
 8 years ago
omar a78ef7a369 Comments 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 a4012fd5b2 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar b5ad88627d Merge various documentation tweaks, comments, todos from the Navigation Branch to reduce drift a little 8 years ago
omar a1bcc8392e Fixed GetScrollMaxX() debug left-over from 7096fd8500 (#1271) 8 years ago
omar 03700ad15e Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
omar 1c991b525a Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
omar 0ab722c3c5 Columns: First first column appearing wider than others (#1266) 8 years ago
omar d43c25d8f4 SetScrollHere() tweak to make the code a little less confusing 8 years ago
omar e36b41cbd0 Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo. 8 years ago
omar 7096fd8500 Fixes for Vertical Scrollbar not automatically getting enabled if enabled Horizontal Scrollbar straddle the vertical limit. (#1271, #246) 8 years ago
omar 233a6efeba Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271) 8 years ago
omar 46c73cccff Popups window can be moved (if they don't have explicit positions provided by user, or e.g. sub-menu popup) (#1252) 8 years ago
omar d762f1dbfb Comments, clarification about io.WantCaptureMouse, io.WantCaptureKeyboard flags timing and NewFrame(). (#1262) 8 years ago
omar 95f2706d1c Clipboard: [windows] Fixed not closing win32 clipboard on early return. (#1264) 8 years ago
omar 40ac84d701 DataTypeApplyOpFromText: renamed local variables + comments to avoid confusion about the fact that int and float paths are not totally symetrical. (#671) 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 fb54dce71c Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2& 8 years ago
omar 72da4081f8 Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order. 8 years ago
omar 2f508c7073 ColorEdit: Extract ColorOptionsPopup() function out of ColorEdit4(). (#346) 8 years ago
omar 10ef5a63f0 ColorPicker: Rearrange code to introduce alternate HSV picker/selector with simpler diff. (#346) 8 years ago
omar cc3cce7567 Comments, minor tidying up. 8 years ago
omar 70ee41b8b3 ColorPicker: Reordered drawing code to match left-to-right display. Extra comments. (#346) 8 years ago
omar 4b2f157fb1 Renamed ImGuiColorEditFlags_ModeMask_ to ImGuiColorEditFlags_InputsModeMask_ (#346) 8 years ago
omar efbb1ae04e ColorPicker4: Fixed forwarding _HDR flag from ColorPicker4 back to ColorEdit4 components. (#346) 8 years ago
omar 3ee969c3e3 ColorPicker: Alpha bar using a checkerboard. (#346) 8 years ago
omar 3075d8bcd4 ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346) 8 years ago
omar f6a89779c8 ColorEdit4: Hex input clamps integer components to 0..255 range during printout (#346) 8 years ago
omar e1a00c3d26 ColorButton: Added frame border when style border are off. (#346) @jdumas 8 years ago
omar 90fcd4a829 Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346) 8 years ago
omar 3fe7739b5d ColorPicker: Honor ImGuiColorEditFlags_NoTooltip if for some reason user wants that. (#346) 8 years ago
omar 3ffcc72f98 ColorPicker: Better cursor/color preview over the color matrix. (#346) 8 years ago
omar fef8aac523 ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346) 8 years ago