Commit Graph

261 Commits (e118239f6909527f5fb1fa7ef83c2c5ba1e8f132)

Author SHA1 Message Date
omar e682362f35 TODO list update, comments
omar 7e452ec737 Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
omar 942cb0e1f2 Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ()
omar fb54dce71c Internals: Added ImLineClosestPoint, ImTriangleClosestPoint helpers. Changing ImVec2 arg to const ImVec2&
omar 1a26d0bc98 Internals: Added ImDot(), ImRotate(), ImLerp(v2,v2,float) helpers.
omar 72da4081f8 Internals: Added ImTriangleBarycentricCoords() helper. Renamed ImIsPointInTriangle() to ImTriangleContainsPoint(), with different arg order.
omar 390188dfa9 Comments about parts of imgui_internal.h that will self-destruct.
omar fef8aac523 ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. ()
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 ()
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. ()
omar 69dd1ed583 RenderColorRectWithAlphaCheckerboard() in one layer to shunt out anti-alasing artefacts when rounded. Added ImLerp(int,int,float). ()
omar 19c6a9c0e0 ColorButton, ColorPicker: painfully made RenderColorRectWithAlphaCheckerboard more friendly to using Rounding and Border in style, still not perfect :( () + comments
omar 78a8f798c5 ColorEdit, ColorPicker, ColorButton: Display grid under transparent colors (WIP) ()
omar a8b202782f ColorPicker,ColorButton: Honor Border/Shadow style settings ()
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 ()
omar c8553817d9 Merge branch 'master' into 2016-02-colorpicker
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) ()
omar 85d9c8fb46 Internals: renaming IndexWithinParent to OrderWithinParent
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker
omar 12d265fa31 Version 1.51 WIP tag
omar 5e1caaaef3 Version 1.50
omar 92ea8d1131 Merge branch 'master' into 2016-02-colorpicker
omar b8043d3ee5 Internal: Renamed ImLoadFileToMemory to ImFileLoadToMemory to be consistent with ImFileOpen + fix mismatching .h name ()
omar b6c0227add Merge branch 'master' into 2016-02-colorpicker
omar 6257b5814a Added an explicit (internal) ClearActiveID() helper and removed the default NULL window parameter to internal SetActiveID(),
ocornut f4cf972ea9 Merge branch 'master' into 2016-02-colorpicker
ocornut 104b381023 Using _wfopen() under Windows+MSVC because fopen() doesn't support UTF-8 encoding. Wrapped as ImFileOpen(). ()
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.
ocornut 1a0e414d3a Fixed uninitialized variables (wouldn't have a real effect because they'd be cleared in Begin()).
ocornut 98e1d500d4 Support for #define-ing GImGui and IMGUI_SET_CURRENT_CONTEXT_FUNC to enable custom thread-based hackery ()
ocornut dd6163241c Merge branch 'master' into 2016-02-colorpicker
ocornut 1810b3ff38 Added ImGuiCorner enum to clarify some internal code
ocornut abaada4224 Removed the inconsistent shadow under RenderCollapseTriangle() (~#707)
ocornut 404979e48d Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut f2699de242 Fix using IsItemActive() after EndGroup() or any widget using groups (, )
ocornut 1b5bbf725b Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 56cdbe434d Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ()
ocornut 0f303d363a Refactor text alignment options to use ImVec2, removed ImGuiAlign (, )
ocornut de9f8944ea Internal RenderTextClipped() merged optional/rate clip_min* clip_max* into clip_rect*
ocornut c5b8c6303a Refactor PushStyleVar/PopStyleVar so it is constant time + can receive integers (yet unused) ()
ocornut b397fb507e Fixed EndGroup() not restoring offset properly. breaking SameLine() offset (caused by 954c890c67) ()
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut a7f6ea592f Moved GetColorU32 out of imgui_internal.h to avoid inlining mess ()
ocornut 954c890c67 SameLine() with explicit X position is relative to left of group/columns (ref , , )
ocornut d9e2e688e9 InputTextMultiline(): partial fix for when input and internal buffers differs in a way where scrollbar existence differs. ()
Partial fix, won't stop ids from functioning because of a zombie id.
ocornut de61fcc619 Minor bits
ocornut 1ef7980e17 Merge branch 'master' into 2016-02-colorpicker
ocornut c4db79f34b Member variable name renamed "ID" "Id" for casing consistency
ocornut d1c073a199 Comments, tweaks
ocornut 5d4cf1c3f3 Version 1.50 WIP
ocornut adb85d800d Version 1.49
ocornut 9a751da136 Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files
ocornut 3ddb50a925 Merge branch 'master' into 2016-02-colorpicker
ocornut 45dacbf084 Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect.
Relates to horizontal scrollbar, explicit contents size
ocornut b7ebeb1610 Added SetNextWindowSizeConstraint() + demo code ()
ocornut 102d03a7eb Resizing window doesn't rely on MouseDelta anymore, but rather recompute expected size based absolute mouse coords. ()
Storing ActiveIdClickOffset to generalize pattern already used by
columns.
ocornut b630cb5b42 ImGuiWindow: Storing ParentWindow (, )
ocornut 7b9c0a5c3f Renamed ImGuiState -> ImGuiContext (, )
ocornut 8b428e8c74 Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (, )
ocornut ce4d731486 Minor comments, tweaks
ocornut 313d388bba Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows ()
ocornut 89d5026187 Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (, )
ocornut 9733f4fa24 Internal RenderBullet() helper.
ocornut 547f34cf22 Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to )
ocornut df749e3f13 Added CollapsingHeader() variant with close button, obsoleted 4 parameters version. Refactored code into TreeNodeBehavior. ()
New flag and declaration makes uses of SetNextTreeNode() functions on
collapsing header more obvious as well ().
ocornut 7406d64c64 PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup )
ocornut c5149cd53c MenuItem(): checkmark render in disabled color when disabled
ocornut 6bcc31e575 Merge branch 'master' into 2016-02-colorpicker
ocornut ea6b615179 Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ()
ocornut 41215534d5 Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(),
ocornut 7ce6c18bbe Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h ()
ocornut ab4a69bcd4 Comments
ocornut fc3b8d0a56 Relative order of Child windows creation is preserved during sort ()
ocornut 77177c18f0 Merge branch 'master' into 2016-02-colorpicker
ocornut 1588eda1ac Version 1.49 WIP
ocornut 95cbcdca3f Version 1.48
ocornut 4c1d4233b2 Merge branch 'master' into 2016-02-colorpicker
ocornut d53c308852 Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394
ocornut 326c4e40f8 Merge branch 'master' into 2016-02-colorpicker
ocornut cfbf06e394 Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?)
ocornut 2b7eeba143 Trim trailing spaces
ocornut baabe3b62c Merge branch 'master' into 2016-02-colorpicker
ocornut 928832a5bc Various tidying up / comments, moved columns functions declarations, no functional changes
Kyle Rocha b8fcb4e7e4 Converted tabs to spaces
Kyle Rocha 3f46d9b933 Renamed FindTextDisplayEnd to FindRenderedTextEnd
Kyle Rocha 5bffc85ba6 Exposed FindTextDisplayEnd to imgui_internal.h
ocornut 459af7683c Merge branch 'master' into 2016-02-colorpicker
ocornut 2065cbec4d Removed extraneous comma for pedantic compilers ()
ocornut b816d05e33 Minor tidying up following () - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments
ocornut 6846873f23 Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master
ocornut d45044fe54 CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag () + demo + made code a little less messy
ocornut f8fede1d8b Added ColorPicker3/ColorPicker4, refactoring ColorEdit3/ColorEdit4 adding a bunch of flags and access to picker (wip )
Still pretty much experimenting so may break API
ocornut 339b67c01a Exposed FindWindowByName() in imgui_internal.h
ocornut b329a36d27 Moved declaration of SetItemAllowOverlap() to imgui.h (ref )
Nikolay Zapolnov a908c109c0 Added flag for selectables to handle double clicks.
ocornut 7afd62ec57 Tentative fix for GCC/Clang (, )
ocornut 595684e08c Remove dependency on <new> header (, )
(Now expecting something to fail somewhere..)
ocornut 005b897d7d ProgressBar() handling of border size + storing border size in window structure ()
ocornut 3922988dea TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label.
Removed DisableHideTextAfterDoubleHash hack used by Metrics window.
ocornut 4e3c6f64c0 Various minor fixes following a pass of cppcheck static analyzer
ocornut dc4a07c49a Fixed various Clang -Weverything warnings
ocornut e41568f87f Version number 1.48 WIP + Update binaries
ocornut 24d186753e Version number 1.47
ocornut e4cf44e967 Minor rebranding "ImGui" -> "dear imgui" ()
ocornut 40ddf8e287 Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h ()
ocornut 6102aa1375 BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click ()
ocornut 66886405f6 Minor comment ()
ocornut 9b6b1bc0f3 Added GetColorU32 helpers (previously internal and misplaced as window->Color())
ocornut ecc97bda7d Added SetItemAllowOverlap() exposed in imgui_internal.h only
ocornut 9dca2ca960 Comments & spacing
ocornut 6269859315 Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing.
ocornut 4ca34a879d Columns: Fixed bug with indentation within columns, also making code shorter/faster (, )
ocornut 807d4ff92c Columns: minor tidying up while investigating severe issues with indenting within columns ()
ocornut 1aac69c937 Columns: tidying up, moving OffsetT to a ImGuiColumnData structure
ocornut 3102c0c97e Rename internal ColumnsStartX to IndentX, makes more sense
ocornut 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (, , )
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)
ocornut 1a42a3f91b Refactor internal SliderBehavior() to take flags instead of a bool.
Sorry!
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.
ocornut 5f0db60a57 Version number 1.47 WIP
ocornut 72dde4d323 Version 1.46
ocornut 7a61b7dd57 Renamed Window LastFrameDrawn to LastFrameActive, more correct
ocornut 43ff5a41be InputText(): always use live input data for display in read-only mode (fix )
ocornut d087671369 HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API.
ocornut 98465d401b Silencing inadequate MSVC warnings when exporting as DLL ()
ocornut 3b01b0a2f2 Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts ()
ocornut 7b1168eb30 Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size
ocornut 07776595c2 Added missing IMGUI_API definitions in imgui_internal (fix )
ocornut f5fb5f0c1e Minor tidying, reordering functions/members/initialisation to follow same orders
ocornut dafad3903e Added GetDrawData() alternative to setting a Render function.
ocornut 965fa3cb16 Version number 1.46 WIP
ocornut c9e19f8953 Version number 1.45
ocornut 71026d3655 Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo ()
ocornut a3cad2ff06 BeginChild() fixed missing rounding for child sizes which leaked into layout
ocornut 65a191c005 Added optional Horizontal Scrollbar & allow user to explicitly set content width via SetNextWindowContentSize() etc ()
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.
ocornut fc13ae2aa5 Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit ()
ocornut b326c8fd1f Added GetCurrentWindowRead() for functions that don't write to the window
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!)
ocornut 65fe60f2b2 Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) ()
ocornut ad3c9f620d Tabs to spaces
ocornut b1987d697f Trim trailing whitespace ()
ocornut 425c6cb3a3 Remove CaptureInputCharactersFromApp and minor cleanups ()
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input
Conflicts:
	imgui.cpp
ocornut 4ac4d1ac37 ImHash: defaults seed to zero + comment.
ocornut 97be3428f1 Added GetMousePosOnOpeningCurrentPopup().
ocornut 42567a9516 ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer.
ocornut f1f4d68f7f Prevent imgui_internal.h from being included without imgui.h (piles of errors)
ocornut aa3c26fd30 IM_PRINTFARGS takes one argument. Moved pragma outside of .h ()
ocornut b637850260 Merge branch 'master' of https://github.com/tpoechtrager/imgui into tpoechtrager-master
ocornut 14822609bd Version number 1.45 WIP