Commit Graph

426 Commits (75c3793db5316626de94cb77c4529093e987ba15)

Author SHA1 Message Date
ocornut b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf"
ocornut b376b68326 Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
ocornut 357167f917 Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.
James Fulop 6fa3aaf7c0 outdated dragging API mentioned in demo text
Looks like you changed the API on dragging, but did not update the description text for it. 
https://github.com/ocornut/imgui/issues/167
ocornut e4deb7a190 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 404979e48d Merge remote-tracking branch 'origin' into 2016-02-colorpicker
Jeongseok Lee 1d7e05327b Fix clang warning: unknown warning group '-Wreserved-id-macro'
Michał Cichoń 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
ocornut 82dcdc9dfc ShowStyleEditor: tweak font map display to show glyph details when hovered.
ocornut f5b37dbc52 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut fea0fcb7c3 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut d7c518e6cc ShowStyleEditor: show font map / grid in more details.
ocornut ed279c0095 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 1b5bbf725b Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 56cdbe434d Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign ()
ocornut 612b17ef57 Fixing minor english typos ()
ocornut ef10b984fe Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 67fd805839 Merge remote-tracking branch 'origin' into 2016-07-navigation
ocornut 252f094101 Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() ()
Max Thrun 4f389b7f6a Add null terminator to ShowStyleEditor output_type combo options
Without a null terminator the Combo() function indexes outside of the "items_separated_by_zeros" string.
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker
ocornut 785f51227a Demo tweaks
ocornut dcff032429 Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. ()
ocornut 4e91b521ee Demo: Arrange some inputs panels.
ocornut d0801057ba Demo: Tweak handling of "animate" flag in graph demo so it doesn't keep running.
ocornut a154625a56 Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work ()
ocornut b3cba62b80 Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows ()
ocornut d88dcc26cc Demo: console text input keeps focus in a less harsher and more navigation friendly way ()
ocornut e2dd48ae65 Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus ()
ocornut 04157da291 Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) ()
ocornut c2cb2a6928 Gamepad/Keyboard navigation support, initial commit, WIP ()
ocornut e72e3b2cbc Demo: tweaks.
ocornut 91e1c56da6 Minor bits.
ocornut de61fcc619 Minor bits
ocornut 1ef7980e17 Merge branch 'master' into 2016-02-colorpicker
ocornut 4fddfa4b5e Demo: extra (somehow duplicate) Selectables+Columns demo
ocornut d6a5fd06d7 Demo: Added an extra 3-way columns demo
ocornut d1c073a199 Comments, tweaks
ocornut 5d4cf1c3f3 Version 1.50 WIP
ocornut adb85d800d Version 1.49
ocornut 3ddb50a925 Merge branch 'master' into 2016-02-colorpicker
ocornut 1483a69c11 Demo: Tree: showing how to align tree node label with current x position (, )
ocornut a0a48f6e59 Added TreeAdvanceToLabelPos() ()
ocornut 806a146198 TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (, )
ocornut b5521a81d4 Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection ()
ocornut 8f4b123e1b SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints ()
ocornut e3d8055d90 Speculative 64-bit warning fix ()
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 69a29e4715 Added NewLine() (very shy reminder that isn't done)
ocornut 7a28f5bb81 ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere ()
ocornut fa5ae60bce Demo: added decorated label to some vertical sliders.
ocornut 339e191c53 Demo: Console: Add a "Scroll to bottom" button ()
ocornut 9e6ed0991d Demo: clarified misleading example ()
ocornut a2a5d71582 Demo: Tweak irritating pink color.
ocornut b628acbb52 StyleEditor: comments ()
omar 10d3da6b73 Merge pull request from cosmy1/errors-fix
Fix compilation errors when disabling test windows.
ocornut 8648346eab Modal: fixed non-child window stacked over a modal losing its hoverabilty/focusability (, )
Branimir Karadžić a59a04f4d0 Fixed iOS/OSX build.
cosmy1 4b5a4cae09 Fix compilation errors when disabling test windows.
Sergej Reich 6e8579fc14 Ignore implicit conversion warnings
ocornut ce4d731486 Minor comments, tweaks
ocornut 79ad22e1f2 Fixed various Clang -Weverything warnings ()
ocornut 4ce6cf0512 Demo: Moved "Fonts" section style editor
ocornut 89d5026187 Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (, )
ocornut bb674ccee6 TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag (, )
ocornut f79b2d6ce3 TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag (, , )
ocornut dc8446d048 Demo: Added simple tree node selection demo (, , )
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 6bcc31e575 Merge branch 'master' into 2016-02-colorpicker
ocornut ea6b615179 Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. ()
ocornut 7da2d51480 MenuBar fixed missing lower border
ocornut 77177c18f0 Merge branch 'master' into 2016-02-colorpicker
ocornut 1588eda1ac Version 1.49 WIP
ocornut 95cbcdca3f Version 1.48
ocornut 4c25de950c Warning fixes for clang. Using int64_t, may be an issue?
cheriff 2ee76bbff6 Trivial format string fix in demo
ocornut e808b7cfca Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. ()
bg_alpha parameter of 5-parameters version of Begin() is an override,
however that function may become obsolete someday.
ocornut 4c1d4233b2 Merge branch 'master' into 2016-02-colorpicker
ocornut a6399f120f IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) ()
NB: Value not used.
ocornut 326c4e40f8 Merge branch 'master' into 2016-02-colorpicker
ocornut 2b7eeba143 Trim trailing spaces
ocornut baabe3b62c Merge branch 'master' into 2016-02-colorpicker
ocornut 5bed7144fe ImDrawList: Added AddTriangle() function
ocornut a274a09955 Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to )
ocornut 9cbc6e196b ImDrawList: AddRect() added optional thickness parameter + updated demo
ocornut 459af7683c Merge branch 'master' into 2016-02-colorpicker
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 cf12bc7dea InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. ()
ocornut ba80a457b9 Demo: plot code doesn't use ImVector to avoid heap allocation + comment ()
ocornut 4afe67cdc8 Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) ()
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 dafedc3246 Demo: use locally defined strdup because compilers/standard librairies are an annoyance ()
ocornut 2c6bc95dd5 Demo: InputText password demo filters out blanks ()
Nikolay Zapolnov a908c109c0 Added flag for selectables to handle double clicks.
ocornut bf6f6ba858 Demo: extra comments and example for PushItemWidth(-1)
ocornut 81c86dd5e7 Various minor fixes following a pass of cppcheck static analyzer
ocornut 68bde7b862 Clarify comment ()
ocornut 6dbdc69131 ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup
ocornut 668a247af0 Demo: added more draw primitives in the Custom Rendering example ()
ocornut e41568f87f Version number 1.48 WIP + Update binaries
ocornut 24d186753e Version number 1.47
ocornut e4cf44e967 Minor rebranding "ImGui" -> "dear imgui" ()
ocornut 2e5352786a Bullet(), BulletText(): vertical and horizontal alignment fixes (namely for widget sized line height). (followup to , )
ocornut 558430ca8f TreeNode() fixed alignment of collapse arrow to it matches bullet (broken in 4006fb77bc)
ocornut 5084f90a0d Added ProgressBar() ()
ocornut 02ce1a2b32 Demo: Display extra info from ImFontConfig in the font display
ocornut 18223fd3ab Demo: Tweak window option and style display
ocornut a9bdda0d95 Demo: Added style editor in demo menu + exposed WindowFillAlphaDefault
ocornut a500c0daf7 Demo: some TreeNode layout examples (, )
ocornut 4006fb77bc TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after (, )
ocornut eb6575508f Demo: Tweaked Clipping example.
ocornut b2b4bbe5ea Demo: Fixed variable shadowing warning.
ocornut 79b09e7d10 Fixed int>void* warnings for 64-bits architectures and fancy warnings
ocornut ba77166432 Demo: comments ()
ocornut 32d2768734 Demo: Moved property editor demo to its own mini example applet ()
ocornut d3df39fed1 Columns: Added Property Tree demo among tidying up demos (, )
ocornut 807d4ff92c Columns: minor tidying up while investigating severe issues with indenting within columns ()
ocornut 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (, , )
ocornut 6b03ddbcb1 Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment ()
ocornut f87deff0f3 Moving stdlib.h include outside of imgui.h ()
ocornut 6ffe0fddbf Examples: Fixed crash when both buttons are held ()
ocornut 5f0db60a57 Version number 1.47 WIP
ocornut 72dde4d323 Version 1.46
ocornut bc34ac882f InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo
ocornut f21fda1231 Scrollbar: Tweaked scrollbar inner padding for small scrollbars.
ocornut 5d3d136733 Scrollbar: horizontal scrollbar demo allows to enable simultanaeous scrollbars on both axises.
ocornut 127f44c12b Demo: Extra plotting examples.
ocornut c4562ac573 Fixed mouse click detection to be more friendly to DeltaTime 0.0 ()
ocornut 0abe668221 ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice()
ocornut 2903c98bca Minor typo
ocornut b4f1e88860 Added ImGuiInputTextFlags_ReadOnly flag for InputText()/InputTextMultiline() ()
ocornut a09411b936 Demo: using MouseDelta
ocornut 965fa3cb16 Version number 1.46 WIP
ocornut c9e19f8953 Version number 1.45
ocornut e4ef140e10 Speculative Linux build fix, not using itoa ()
ocornut 350d96466e Demo: tweaks ()
ocornut 71026d3655 Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo ()
ocornut e5e9c5cfbe Demo: removed extraneous flag in demo code + tweak comment ()
ocornut afa0346a0b Demo: using DragFloat instead of SliderFloat
ocornut f128a8bce1 ColumnsStartX include window->Scroll.x to simplify code ()
ocornut 9e5fb40ddd Demo: added horizontal scrolling example + enabled in console, log and child examples ()
ocornut d88b73a8b7 Added GetContentRegionAvailWidth() helper. Demo tweaks.
ocornut aa35547f94 Demo: long text example uses ImGuiListClipper
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!)
ocornut 62a3142036 Demo: comments.
ocornut e7cc048d81 Demo: custom rendering tweak.
ocornut 0a11024459 IO.WantInputCharacters -> WantTextInput ()
ocornut 8430c88451 Demo: added a bezier curve in the old custom rendering demo.
ocornut 80ad773c87 ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves ()
ocornut b1987d697f Trim trailing whitespace ()
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input
Conflicts:
	imgui.cpp
ocornut 0a6d6da732 Demo: Log: removed unnecessary style change,
ocornut 67b2b5f3a9 Demo: Log: removed broken clipping, tweaks.
ocornut 07de0448f9 ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values
ocornut b770f3ffaf Demo: Add filtering to log with better-than-none storage of line offsets.
ocornut 72d3fca52f Demo: added simple Log demo
ocornut d36a634ac8 Demo: Fixed incorrectly formed string passed to Combo ()
omar 9a97ef673e Merge pull request from tpoechtrager/master
Fixes for compiling Windows target with non-MSVC compiler.
ocornut 6a90ac2094 Tentative GCC/Clang warning fixes with unused functions (cf )
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments
ocornut 23e7bdebcf Warnings for clang ()
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
Thomas Pöchtrager 947cf3434f Added printf attribute to printf like text formatting functions
ocornut a99ba42a39 Version number 1.44
ocornut 155873a6b0 Added GetContentRegionAvail() helper
ocornut 1befd21b37 Moved ShowUserGuide() after ShowTestWindow() ()
ocornut 3658314638 imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built ()
ocornut e47bf041bf Clang warning fixes
ocornut e1ac5a3198 Honor IMGUI_DISABLE_TEST_WINDOWS as described ()
ocornut 5a29eef1fa Fixed further warnings with GCC/Clang ()
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h ()