626 Commits (d5400d9517090dd99893ebb5147971288269efce)

Author SHA1 Message Date
omar 9737efb2f1 Nav: Store per-window last nav id also per-layer so we can easily query them for menu navigation code. (#787) 7 years ago
omar 8a814487fe Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 30b1d85962 Nav: Commiting some better organized Debug helper because this going to stay for a bit. 7 years ago
omar 164f22d5b7 Comments 7 years ago
omar df366b230e ColorPicker4: Use nav flag to provide a slighly better experience when using navigation (#787, #346) 7 years ago
omar 2d859dee4e Nav: Added ImGuiItemFlags_NoNav item flag 7 years ago
omar 4b4e455c40 Nav: Internal nenaming 7 years ago
omar 50ba543743 Comments 7 years ago
omar e0a2a832cd Nav: Changed internal flag to NoNavDefaultFocus to be false by allow, and more consistent (#787) 7 years ago
omar ca4db8c905 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 926c1cf9a4 Merged from Navigation branch: ImGuiItemFlags_SelectableDontClosePopup flag 7 years ago
omar f99348711b Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that. 7 years ago
omar d394c7ad0b Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_internal.h
7 years ago
omar 0106dcbd02 Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily. 7 years ago
omar 35f65e05ed Merge branch 'master' into navigation 7 years ago
omar fafe65a8fc Refactor to move the responsability of SetHovered() to ItemHoverable() - previously IsHovered(). Simpler and the parallel to ItemAdd is clearer with the new name. 7 years ago
omar 7bcb1d3816 Internals: ButtonBehavior(), IsHovered() moved the responsability of flatten_child higher level to ButtonBehavior() - not super sure about the elegance of this 7 years ago
omar cc26db8ec7 Merge branch 'master' into navigation 7 years ago
omar 0adcddac39 IsItemHovered(), ItemAdd(): finishing cleaning up, moved the code to IsItemHovered() so ItemAdd() is more lightweight and the two IsXXXHovered functions are now very similar, making their differences less confusing. 7 years ago
omar 99c7622a1b ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered(). 7 years ago
omar a2b2e56e8e Merge branch 'master' into navigation 7 years ago
omar 8374a454da Removed extraneous ImGui:: prefixes. Declared ColorEditOptionsPopup in imgui_internals.h. Tweaked internal signatures. 7 years ago
omar 8fd4beddb8 Merge branch 'master' into navigation 7 years ago
omar 072d6d8cb5 ImFontAtlas: Refactored internals API to 1) avoid building lookup table multiple times for merged fonts + 2) allow the mapping of custom icons inside fonts (wip, uncommited) 7 years ago
omar f1a20ec66d Merge branch 'master' into navigation 7 years ago
omar be03882a15 Separator(): output vertical separator when used in horizontal layout mode, so it works in menu bars. 7 years ago
omar 69d0d33451 Exposed PushMultiItemsWidths() to imgui_internal.h 7 years ago
omar 7e8069dd23 Merge branch 'master' into navigation 7 years ago
omar 0d56140b4a BeginCombo(): rework internals a little to make it easier to provide custom combo-like elements relying in BeginCombo().
BeginPopupEx() doesn't enforce AlwaysAutoResize flag anymore.
7 years ago
omar 4b82759598 SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
7 years ago
omar 0a5fb24f10 Popups: Exposing a little more of popups internals in imgui_internals.h 7 years ago
omar 44e8d94aba Merge branch 'master' into navigation 7 years ago
Bruce Mitchener 2fcdeb7f12 Remove commas after last item in enumeration.
This brings these enums to match the rest of the code and fixes
2 warnings under clang about using C++11 extensions.
7 years ago
omar 66a9d4856c Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar cb2775ae54 Internals: ImGuiItemFlags comments 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 2169bf6895 Fixed WantTextInput from being true when an activated Drag or Slider was previously turned into an InputText(). (#1317) 7 years ago
omar 790605e359 Minor comments + renaming internal fields 7 years ago
omar e8dbf1c795 Combo: Internally split into BeginCombo(), EndCombo(), toward a more flexible combo api. 7 years ago
omar 804ee78731 Added IsWindowAppearing(). 7 years ago
omar ddf41b0398 Merged from Navigation branch. TAB/Alt-TAB processing now deactivate if holding Ctrl. 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 2ee1b70652 Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar 01d4bf299a Added overcomplicated RenderRectFilledRangeH() to fix rounded progress bar, which will also help for range widgets and perhaps sliders grabs over rounded areas. (#1296, #76) 7 years ago
omar 7a9ea281be ImSwap() helper. 7 years ago
omar 1f51e8f39d Internals: Renamed some ImGuiCorner enums. 7 years ago
omar 807322c9a5 Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
7 years ago
omar 419b22a487 Internals: Split some code out of NewFrame() into an Initialize() function. 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 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 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 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 53e73182ff Merge branch 'master' into navigation
# Conflicts:
#	imgui_internal.h
7 years ago
omar 530baee1a7 Removed tabs that slipped through the cracks 7 years ago
omar 067127f113 Columns: Caching columns clipping rectangles (#125) 7 years ago
omar adeaf1cd72 Columns: Moved PushColumnClipRect() to imgui_internal.h 7 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) 7 years ago
omar 7f0063f858 Columns: Added ImGuiColumnsFlags_NoResize flag (internal). (#913, #125) 7 years ago
omar 19a42cb2fd Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125) 7 years ago
omar bc78535bbf Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
#	imgui.cpp
#	imgui.h
7 years ago
omar bf0d9c123e Merge branch 'master' into navigation 7 years ago
omar 8be7a60f20 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 7 years ago
omar 1086c87767 ImFontAtlas: Re-arranging code to simplify implementation of imgui_freetype. (#618) 7 years ago
omar 4075cc58e9 ImFontAtlas; Re-arranging code to simplify implementation of imgui_freetype (#618) 7 years ago
omar a85a14370b OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier. 7 years ago
omar d2259f65e5 Undo part of 32dbe836d0 to keep the same name for both overloads (#891, #799) 7 years ago
omar e682362f35 TODO list update, comments 7 years ago
omar 73f9c9d80c Merge branch 'master' into navigation
# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
7 years ago
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS 7 years ago
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 fb54dce71c Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2& 7 years ago
omar 1a26d0bc98 Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers. 7 years ago
omar 72da4081f8 Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order. 7 years ago
omar 390188dfa9 Comments about parts of imgui_internal.h that will self-destruct. 7 years ago
omar fef8aac523 ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346) 7 years ago
omar 7537dff806 ColorEdit4: Picker spawned from ColorEdit4 has a preview for original/previous color with revert button - WIP not really happy with it being in ColorEdit4 code (#346) 7 years ago
omar bfec9c657e ColorButton: Pretty much gave up with getting the checkerboard + AA + rounding + blending + offset all working together with every combination under the sun. It works as long as you don't sneeze. (#346) 7 years ago
omar 69dd1ed583 RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). (#346) 7 years ago
omar 19c6a9c0e0 ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( (#346) + comments 7 years ago
omar 78a8f798c5 ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) (#346) 7 years ago
omar a8b202782f ColorPicker,ColorButton: Honor Border/Shadow style settings (#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 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 85d9c8fb46 Internals: renaming IndexWithinParent to OrderWithinParent 7 years ago
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker 7 years ago
omar 12d265fa31 Version 1.51 WIP tag 7 years ago
omar 5e1caaaef3 Version 1.50 7 years ago
omar 2a3c61e5f8 Merge branch 'master' into 2016-07-navigation 8 years ago
omar 92ea8d1131 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar b8043d3ee5 Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name (#917) 8 years ago
omar b6c0227add Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar c76be71acf Merge branch 'master' into 2016-07-navigation 8 years ago
omar 6257b5814a Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(), 8 years ago
ocornut 3028ccc25b Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut f4cf972ea9 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut 104b381023 Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). (#917) 8 years ago
Geoffrey Tucker 66c4281290 Began improvements to columns API by splitting the Columns() function into BeginColumns() and EndColumns() and adding additional flags. The columns data still needs to be placed into a stack. 8 years ago
ocornut 1a0e414d3a Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()). 8 years ago
ocornut 98e1d500d4 Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery (#586) 8 years ago
ocornut dd6163241c Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut bdb34d1c11 Merge branch 'master' into 2016-07-navigation 8 years ago
ocornut 1810b3ff38 Added ImGuiCorner enum to clarify some internal code 8 years ago
ocornut abaada4224 Removed the inconsistent shadow under RenderCollapseTriangle() (~#707) 8 years ago
ocornut 404979e48d Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
ocornut fea0fcb7c3 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut f2699de242 Fix using IsItemActive() after EndGroup() or any widget using groups (#840, #479) 8 years ago
ocornut ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut 1b5bbf725b Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
ocornut 56cdbe434d Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842) 8 years ago
ocornut 0f303d363a Refactor text alignment options to use ImVec2, removed ImGuiAlign (#842, #222) 8 years ago
ocornut de9f8944ea Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect* 8 years ago
ocornut c5b8c6303a Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) (#842) 8 years ago
ocornut b397fb507e Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) (#829) 8 years ago
ocornut ac7826c8a5 ImRect: Added Translate() helper, removed redundant and misleading Reduce() 8 years ago
ocornut ea2425ad9a Nav: Fixed entering child with PadActivate not setting ActiveIdSource to Nav (#323) 8 years ago
ocornut 695ca7bb45 Nav: Tidying up. Comments. (#323) 8 years ago
ocornut cf16ba6572 Nav: Exposed RenderNavHighlight() in imgui_internal.h to increase discoverability and reordered arguments to be more consistent (#323) 8 years ago
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
ocornut 8828889d5e Refactored rare transient bool stacks into a set of flags, added unexposed ImGuiItemFlags_SelectableDontClosePopup (#323) 8 years ago
ocornut cbf24c13ca Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut a7f6ea592f Moved GetColorU32 out of imgui_internal.h to avoid inlining mess (#759) 8 years ago
ocornut dcff032429 Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. (#323) 8 years ago
ocornut e9c881e4de Nav: fixed using NavMenu/windowing select when no window is already focused + cleanup code (#323) 8 years ago
ocornut 08a28c16ae Nav: Merge FocusedWindow and NavWindow that were basically duplicate at this point (#323) 8 years ago
ocornut 2545d75c3b Tidying up, removed two unnecessary window flags from being exposed in imgui.h 8 years ago
ocornut b3cba62b80 Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows (#323) 8 years ago
ocornut f72e2fd1b1 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut 954c890c67 SameLine() with explicit X position is relative to left of group/columns (ref #746, #125, #630) 8 years ago
ocornut e2dd48ae65 Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus (#323) 8 years ago
ocornut 04157da291 Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) (#323) 8 years ago
ocornut 4309b8c1ed Clarifying that MovedWindow* apply to mouse moving only 8 years ago
ocornut efc8858328 ImRect: fixed Clip() function being the other way around (INTERNAL API BREAKING CHANGE- wasn't exposed, hoping nobody uses that) + actually fixes the function behavior. 8 years ago
ocornut d6ce800a20 Nav: ActiveIdAllowNavMove -> ActiveIdAllowNavDirFlags for more flexibility (nav up/down typically allowed on a single-line text input) (#323) 8 years ago
ocornut d9d6b0e629 Nav: Renamed private ImGuiNavDir_ enum to use left/right/up/down to be consistent with key enums (#323) 8 years ago
ocornut b2aaab873d Nav: collapse button is interactve, allow collapsing, tidying up, resize speed takes account of framebuffer scale (#323) 8 years ago
ocornut 20a0fde012 Tidying up default clipboard handler for non Windows-OS 8 years ago
ocornut aeabda5a5f Navigation: Tap NavMenu to access menu and close buttons, hold to focus/resize (#323)
Introducing a concept of NavLayer to filter navigable items
8 years ago
ocornut 175f42420c Navigation: Can nav-out but not nav-in a window with ImGuiWindowFlags_NoNav flag (#323) 8 years ago
ocornut a424d6f805 Navigation: Fixed missing initialization (had no side-effect, would be set in Begin) (#323) 8 years ago
ocornut 5cac4926c8 Fixed display of TitleBgActive color on window before a Modal window + modal window availability for navigation (#323) 8 years ago
ocornut ba43310df1 Navigation: Renaming, shortened some unnecessary long fields names (#323) 8 years ago
ocornut 4bbdaa4e3c Navigation: Moving NavInitWindow() around and making it static (#323) 8 years ago
ocornut c2cb2a6928 Gamepad/Keyboard navigation support, initial commit, WIP (#323) 8 years ago
ocornut 0300e73b3f Comments 8 years ago
ocornut 2df229d002 Fixed incorrect comment for ParentWindow (#615, #604) 8 years ago
ocornut 91e1c56da6 Minor bits. 8 years ago
ocornut d9e2e688e9 InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. (#725)
Partial fix, won't stop ids from functioning because of a zombie id.
8 years ago
ocornut de61fcc619 Minor bits 8 years ago
ocornut 1ef7980e17 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut c4db79f34b Member variable name renamed "ID" "Id" for casing consistency 8 years ago
ocornut d1c073a199 Comments, tweaks 8 years ago
ocornut 5d4cf1c3f3 Version 1.50 WIP 8 years ago
ocornut adb85d800d Version 1.49 8 years ago
ocornut 9a751da136 Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files 8 years ago
ocornut 3ddb50a925 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut 45dacbf084 Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect.
Relates to horizontal scrollbar, explicit contents size
8 years ago
ocornut b7ebeb1610 Added SetNextWindowSizeConstraint() + demo code (#668) 8 years ago
ocornut 102d03a7eb Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. (#668)
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
9 years ago
ocornut b630cb5b42 ImGuiWindow: Storing ParentWindow (#615, #646) 9 years ago
ocornut 7b9c0a5c3f Renamed ImGuiState -> ImGuiContext (#586, #269) 9 years ago
ocornut 8b428e8c74 Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586, #269) 9 years ago
ocornut ce4d731486 Minor comments, tweaks 9 years ago
ocornut 313d388bba Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows (#635) 9 years ago
ocornut 89d5026187 Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (#625, #579) 9 years ago
ocornut 9733f4fa24 Internal RenderBullet() helper. 9 years ago
ocornut 547f34cf22 Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516) 9 years ago
ocornut df749e3f13 Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. (#600)
New flag and declaration makes uses of SetNextTreeNode() functions on
collapsing header more obvious as well (#579).
9 years ago
ocornut 7406d64c64 PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582) 9 years ago
ocornut c5149cd53c MenuItem(): checkmark render in disabled color when disabled 9 years ago
ocornut 6bcc31e575 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut ea6b615179 Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610) 9 years ago
ocornut 41215534d5 Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(), 9 years ago
ocornut 7ce6c18bbe Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h (#600) 9 years ago
ocornut ab4a69bcd4 Comments 9 years ago
ocornut fc3b8d0a56 Relative order of Child windows creation is preserved during sort (#595) 9 years ago
ocornut 77177c18f0 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 1588eda1ac Version 1.49 WIP 9 years ago
ocornut 95cbcdca3f Version 1.48 9 years ago
ocornut 4c1d4233b2 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut d53c308852 Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394 9 years ago
ocornut 326c4e40f8 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut cfbf06e394 Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?) 9 years ago
ocornut 2b7eeba143 Trim trailing spaces 9 years ago
ocornut baabe3b62c Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 928832a5bc Various tidying up / comments, moved columns functions declarations, no functional changes 9 years ago
Kyle Rocha b8fcb4e7e4 Converted tabs to spaces 9 years ago
Kyle Rocha 3f46d9b933 Renamed FindTextDisplayEnd to FindRenderedTextEnd 9 years ago
Kyle Rocha 5bffc85ba6 Exposed FindTextDisplayEnd to imgui_internal.h 9 years ago
ocornut 459af7683c Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 2065cbec4d Removed extraneous comma for pedantic compilers (#516) 9 years ago
ocornut b816d05e33 Minor tidying up following (#516) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments 9 years ago
ocornut 6846873f23 Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master 9 years ago
ocornut d45044fe54 CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag (#533) + demo + made code a little less messy 9 years ago
ocornut f8fede1d8b Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip #346)
Still pretty much experimenting so may break API
9 years ago
ocornut 339b67c01a Exposed FindWindowByName() in imgui_internal.h 9 years ago
ocornut b329a36d27 Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517) 9 years ago
Nikolay Zapolnov a908c109c0 Added flag for selectables to handle double clicks. 9 years ago
ocornut 7afd62ec57 Tentative fix for GCC/Clang (#484, #504) 9 years ago
ocornut 595684e08c Remove dependency on <new> header (#484, #504)
(Now expecting something to fail somewhere..)
9 years ago
ocornut 005b897d7d ProgressBar() handling of border size + storing border size in window structure (#503) 9 years ago
ocornut 3922988dea TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label.
Removed DisableHideTextAfterDoubleHash hack used by Metrics window.
9 years ago
ocornut 4e3c6f64c0 Various minor fixes following a pass of cppcheck static analyzer 9 years ago
ocornut dc4a07c49a Fixed various Clang -Weverything warnings 9 years ago
ocornut e41568f87f Version number 1.48 WIP + Update binaries 9 years ago
ocornut 24d186753e Version number 1.47 9 years ago
ocornut e4cf44e967 Minor rebranding "ImGui" -> "dear imgui" (#21) 9 years ago
ocornut 40ddf8e287 Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h (#448) 9 years ago
ocornut 6102aa1375 BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click (#439) 9 years ago
ocornut 66886405f6 Minor comment (#439) 9 years ago
ocornut 9b6b1bc0f3 Added GetColorU32 helpers (previously internal and misplaced as window->Color()) 9 years ago
ocornut ecc97bda7d Added SetItemAllowOverlap() exposed in imgui_internal.h only 9 years ago
ocornut 9dca2ca960 Comments & spacing 9 years ago
ocornut 6269859315 Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing. 9 years ago
ocornut 4ca34a879d Columns: Fixed bug with indentation within columns, also making code shorter/faster (#414, #125) 9 years ago
ocornut 807d4ff92c Columns: minor tidying up while investigating severe issues with indenting within columns (#414) 9 years ago
ocornut 1aac69c937 Columns: tidying up, moving OffsetT to a ImGuiColumnData structure 9 years ago
ocornut 3102c0c97e Rename internal ColumnsStartX to IndentX, makes more sense 9 years ago
ocornut 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374) 9 years ago
Jason Wilkins 4dee8473b5 Fixed a couple of problems found by CppCat code analyzer.
* incorrect implementation of ImVec4 operator- which always gives a w value of 0
* boolean formula of ((A && B) || B) can be simplified to just (B)
9 years ago
ocornut 1a42a3f91b Refactor internal SliderBehavior() to take flags instead of a bool.
Sorry!
9 years ago
ocornut 3eabad0321 Refactor - Internal ButtonBehavior() removed unnecessary boolean arg, merged into flags using ImGuiButtonFlags_NoKeyModifiers.
This is quite a risky change frankly but I'd rather refactor sooner than
later. Hopefully few people are using the internal functions.
9 years ago
ocornut 5f0db60a57 Version number 1.47 WIP 9 years ago
ocornut 72dde4d323 Version 1.46 9 years ago
ocornut 7a61b7dd57 Renamed Window LastFrameDrawn to LastFrameActive, more correct 9 years ago
ocornut 43ff5a41be InputText(): always use live input data for display in read-only mode (fix #360) 9 years ago
ocornut d087671369 HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API. 9 years ago
ocornut 98465d401b Silencing inadequate MSVC warnings when exporting as DLL (#345) 9 years ago
ocornut 3b01b0a2f2 Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts (#335) 9 years ago
ocornut 7b1168eb30 Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size 9 years ago
ocornut 07776595c2 Added missing IMGUI_API definitions in imgui_internal (fix #326) 9 years ago
ocornut f5fb5f0c1e Minor tidying, reordering functions/members/initialisation to follow same orders 9 years ago
ocornut dafad3903e Added GetDrawData() alternative to setting a Render function. 9 years ago
ocornut 965fa3cb16 Version number 1.46 WIP 9 years ago
ocornut c9e19f8953 Version number 1.45 9 years ago
ocornut 71026d3655 Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246) 9 years ago
ocornut a3cad2ff06 BeginChild() fixed missing rounding for child sizes which leaked into layout 9 years ago
ocornut 65a191c005 Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc (#246)
GetCursorPos, SetCursorPos, GetContentRegionMax,
GetWindowContentRegionMin, GetWindowContentRegionMax are now including
the scrolling amount. It PROBABLY shouldn't break anything for you, but
take note that SetCursorPosX(100.0f) puts you at +100 from the starting
x position which may include scrolling, not at +100 from the window left
side.
9 years ago
ocornut fc13ae2aa5 Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit (#246) 9 years ago
ocornut b326c8fd1f Added GetCurrentWindowRead() for functions that don't write to the window 9 years ago
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!) 9 years ago
ocornut 65fe60f2b2 Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) (#282) 9 years ago
ocornut ad3c9f620d Tabs to spaces 9 years ago
ocornut b1987d697f Trim trailing whitespace (#305) 9 years ago
ocornut 425c6cb3a3 Remove CaptureInputCharactersFromApp and minor cleanups (#305) 9 years ago
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input
Conflicts:
	imgui.cpp
9 years ago
ocornut 4ac4d1ac37 ImHash: defaults seed to zero + comment. 9 years ago
ocornut 97be3428f1 Added GetMousePosOnOpeningCurrentPopup(). 9 years ago
ocornut 42567a9516 ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer. 9 years ago
ocornut f1f4d68f7f Prevent imgui_internal.h from being included without imgui.h (piles of errors) 9 years ago
ocornut aa3c26fd30 IM_PRINTFARGS takes one argument. Moved pragma outside of .h (#295) 9 years ago
ocornut b637850260 Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master 9 years ago
ocornut 14822609bd Version number 1.45 WIP 9 years ago
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions 9 years ago
ocornut a99ba42a39 Version number 1.44 9 years ago
ocornut 88a00f77e9 Cleanup - using ImRect more consistently for ImGui-side cliprect data 9 years ago
ocornut f1fb62fa6d Cleanup - shuffle functions around (#219) 9 years ago
ocornut 9b19f8c19d Merge branch 'master' into 2015-07-cleanup
Conflicts:
	imgui.cpp
9 years ago
ocornut 1b0a8f9ac3 Comments 9 years ago
ocornut 4b29cc9e10 Exposed relevant functions in imgui_internal.h (#219) 9 years ago
ocornut f63beeae86 Internal version of LogText() -> LogRenderedText() + shallow tidying up 9 years ago
ocornut abf823c6f6 Tidying up 9 years ago
ocornut 7552f48d7b ImLoadFileToMemory() default parameters 9 years ago
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 9 years ago