1206 Commits (8733ca49b0a2f29d858e2121f41759187bc7e234)

Author SHA1 Message Date
omar c8553817d9 Merge branch 'master' into 2016-02-colorpicker 7 years ago
omar 100d30a0a1 Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169) 7 years ago
omar 3e4cb40d45 Merge branch 'master' into 2016-02-colorpicker 7 years ago
omar 8261d9ff30 Comments (#1172, #1231) 7 years ago
omar 12d265fa31 Version 1.51 WIP tag 7 years ago
omar 5e1caaaef3 Version 1.50 7 years ago
omar 8228dc20df Merge branch 'master' into 2016-07-navigation 7 years ago
omar c038339a4c Merge branch 'master' into 2015-02-colorpicker 7 years ago
omar 026d021df1 Demo: Fixed warnings introduced in 0828a1fd6c 7 years ago
omar 0828a1fd6c Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account 8 years ago
omar 497381dc3d Comments 8 years ago
omar 89b1497843 Merge branch 'master' into 2016-02-colorpicker 8 years ago
omar 288dccd5a5 Merge branch 'master' into 2016-07-navigation 8 years ago
omar e10ceebd36 ImFont: Store the texture surface used to get an idea of how costly each font is. 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 714beb217c Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end. 8 years ago
ocornut 68df09cf47 Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse) 8 years ago
ocornut a60b2cc645 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut fdc70456f4 Merge branch 'master' into 2016-07-navigation 8 years ago
ocornut 52308a54f8 Demo: comments 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
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 fdbad2708c Ignore GCC 6 warnings (#883) 8 years ago
ocornut 775ac24d45 Fixed overzealous GCC warnings (#883) + partly undo 8553bab241 8 years ago
ocornut 8553bab241 Ignoring overzealous GCC warnings (#883) 8 years ago
ocornut 941cf1b436 Merge branch 'master' into 2016-07-navigation 8 years ago
ocornut ccb3db94da Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut faafcf418d Demo: Comments, even though nobody appears to read the comments. 8 years ago
ocornut b2f0ea6c0d Font: Default font given explicit name "ProggyClean.ttf" 8 years ago
ocornut b376b68326 Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code 8 years ago
ocornut 357167f917 Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing. 8 years ago
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
8 years ago
ocornut e4deb7a190 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut 404979e48d Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
Jeongseok Lee 1d7e05327b Fix clang warning: unknown warning group '-Wreserved-id-macro' 8 years ago
Michał Cichoń 1999c01db8 Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format. 8 years ago
ocornut 82dcdc9dfc ShowStyleEditor: tweak font map display to show glyph details when hovered. 8 years ago
ocornut f5b37dbc52 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut fea0fcb7c3 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut d7c518e6cc ShowStyleEditor: show font map / grid in more details. 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 612b17ef57 Fixing minor english typos (#827) 8 years ago
ocornut ef10b984fe Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
ocornut 67fd805839 Merge remote-tracking branch 'origin' into 2016-07-navigation 8 years ago
ocornut 252f094101 Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() (#323) 8 years ago
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.
8 years ago
ocornut 996eb080fa Merge remote-tracking branch 'origin' into 2016-02-colorpicker 8 years ago
ocornut 785f51227a Demo tweaks 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 4e91b521ee Demo: Arrange some inputs panels. 8 years ago
ocornut d0801057ba Demo: Tweak handling of "animate" flag in graph demo so it doesn't keep running. 8 years ago
ocornut a154625a56 Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work (#323) 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 d88dcc26cc Demo: console text input keeps focus in a less harsher and more navigation friendly way (#323) 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 c2cb2a6928 Gamepad/Keyboard navigation support, initial commit, WIP (#323) 8 years ago
ocornut e72e3b2cbc Demo: tweaks. 8 years ago
ocornut 91e1c56da6 Minor bits. 8 years ago
ocornut de61fcc619 Minor bits 8 years ago
ocornut 1ef7980e17 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut 4fddfa4b5e Demo: extra (somehow duplicate) Selectables+Columns demo 8 years ago
ocornut d6a5fd06d7 Demo: Added an extra 3-way columns demo 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 3ddb50a925 Merge branch 'master' into 2016-02-colorpicker 8 years ago
ocornut 1483a69c11 Demo: Tree: showing how to align tree node label with current x position (#324, #581) 8 years ago
ocornut a0a48f6e59 Added TreeAdvanceToLabelPos() (#581) 8 years ago
ocornut 806a146198 TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324, #581) 8 years ago
ocornut b5521a81d4 Demo: fixed multi-selection tree nodes demo to not replace selection when clicking on single-item that's already part of selection (#581) 8 years ago
ocornut 8f4b123e1b SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints (#668) 8 years ago
ocornut e3d8055d90 Speculative 64-bit warning fix (#668) 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 69a29e4715 Added NewLine() (very shy reminder that #97 isn't done) 9 years ago
ocornut 7a28f5bb81 ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere (#662) 9 years ago
ocornut fa5ae60bce Demo: added decorated label to some vertical sliders. 9 years ago
ocornut 339e191c53 Demo: Console: Add a "Scroll to bottom" button (#662) 9 years ago
ocornut 9e6ed0991d Demo: clarified misleading example (#660) 9 years ago
ocornut a2a5d71582 Demo: Tweak irritating pink color. 9 years ago
ocornut b628acbb52 StyleEditor: comments (#652) 9 years ago
omar 10d3da6b73 Merge pull request #641 from cosmy1/errors-fix
Fix compilation errors when disabling test windows.
9 years ago
ocornut 8648346eab Modal: fixed non-child window stacked over a modal losing its hoverabilty/focusability (#615, #604) 9 years ago
Branimir Karadžić a59a04f4d0 Fixed iOS/OSX build. 9 years ago
cosmy1 4b5a4cae09 Fix compilation errors when disabling test windows. 9 years ago
Sergej Reich 6e8579fc14 Ignore implicit conversion warnings 9 years ago
ocornut ce4d731486 Minor comments, tweaks 9 years ago
ocornut 79ad22e1f2 Fixed various Clang -Weverything warnings (#626) 9 years ago
ocornut 4ce6cf0512 Demo: Moved "Fonts" section style editor 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 bb674ccee6 TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag (#581, #324) 9 years ago
ocornut f79b2d6ce3 TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag (#581, #324, #190) 9 years ago
ocornut dc8446d048 Demo: Added simple tree node selection demo (#581, #516, #190) 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 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 7da2d51480 MenuBar fixed missing lower border 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 4c25de950c Warning fixes for clang. Using int64_t, may be an issue? 9 years ago
cheriff 2ee76bbff6 Trivial format string fix in demo 9 years ago
ocornut e808b7cfca Style: removed WindowFillAlphaDefault which was confusing and redundant, baked into WindowBg color. Renamed TooltipBg > PopupBG. (#337)
bg_alpha parameter of 5-parameters version of Begin() is an override,
however that function may become obsolete someday.
9 years ago
ocornut 4c1d4233b2 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut a6399f120f IO: Added "Super" keyboard modifiers (corresponding to Cmd on Mac and Windows key in theory although the later is hard to read) (#473)
NB: Value not used.
9 years ago
ocornut 326c4e40f8 Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 2b7eeba143 Trim trailing spaces 9 years ago
ocornut baabe3b62c Merge branch 'master' into 2016-02-colorpicker 9 years ago
ocornut 5bed7144fe ImDrawList: Added AddTriangle() function 9 years ago
ocornut a274a09955 Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340) 9 years ago
ocornut 9cbc6e196b ImDrawList: AddRect() added optional thickness parameter + updated demo 9 years ago
ocornut 459af7683c Merge branch 'master' into 2016-02-colorpicker 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 cf12bc7dea InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. (#541) 9 years ago
ocornut ba80a457b9 Demo: plot code doesn't use ImVector to avoid heap allocation + comment (#538) 9 years ago
ocornut 4afe67cdc8 Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) (#536) 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 dafedc3246 Demo: use locally defined strdup because compilers/standard librairies are an annoyance (#520) 9 years ago
ocornut 2c6bc95dd5 Demo: InputText password demo filters out blanks (#515) 9 years ago
Nikolay Zapolnov a908c109c0 Added flag for selectables to handle double clicks. 9 years ago
ocornut bf6f6ba858 Demo: extra comments and example for PushItemWidth(-1) 9 years ago
ocornut 81c86dd5e7 Various minor fixes following a pass of cppcheck static analyzer 9 years ago
ocornut 68bde7b862 Clarify comment (#455) 9 years ago
ocornut 6dbdc69131 ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup #457 9 years ago
ocornut 668a247af0 Demo: added more draw primitives in the Custom Rendering example (#457) 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 2e5352786a Bullet(), BulletText(): vertical and horizontal alignment fixes (namely for widget sized line height). (followup to #414, #282) 9 years ago
ocornut 558430ca8f TreeNode() fixed alignment of collapse arrow to it matches bullet (broken in 4006fb77bc) 9 years ago
ocornut 5084f90a0d Added ProgressBar() (#333) 9 years ago
ocornut 02ce1a2b32 Demo: Display extra info from ImFontConfig in the font display 9 years ago
ocornut 18223fd3ab Demo: Tweak window option and style display 9 years ago
ocornut a9bdda0d95 Demo: Added style editor in demo menu + exposed WindowFillAlphaDefault 9 years ago
ocornut a500c0daf7 Demo: some TreeNode layout examples (#414, #282) 9 years ago
ocornut 4006fb77bc TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after (#414, #282) 9 years ago
ocornut eb6575508f Demo: Tweaked Clipping example. 9 years ago
ocornut b2b4bbe5ea Demo: Fixed variable shadowing warning. 9 years ago
ocornut 79b09e7d10 Fixed int>void* warnings for 64-bits architectures and fancy warnings 9 years ago
ocornut ba77166432 Demo: comments (#414) 9 years ago
ocornut 32d2768734 Demo: Moved property editor demo to its own mini example applet (#414) 9 years ago
ocornut d3df39fed1 Columns: Added Property Tree demo among tidying up demos (#125, #414) 9 years ago
ocornut 807d4ff92c Columns: minor tidying up while investigating severe issues with indenting within columns (#414) 9 years ago
ocornut 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374) 9 years ago
ocornut 6b03ddbcb1 Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment (#409) 9 years ago
ocornut f87deff0f3 Moving stdlib.h include outside of imgui.h (#405) 9 years ago
ocornut 6ffe0fddbf Examples: Fixed crash when both buttons are held (#393) 9 years ago
ocornut 5f0db60a57 Version number 1.47 WIP 9 years ago
ocornut 72dde4d323 Version 1.46 9 years ago
ocornut bc34ac882f InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo 9 years ago
ocornut f21fda1231 Scrollbar: Tweaked scrollbar inner padding for small scrollbars. 9 years ago
ocornut 5d3d136733 Scrollbar: horizontal scrollbar demo allows to enable simultanaeous scrollbars on both axises. 9 years ago
ocornut 127f44c12b Demo: Extra plotting examples. 9 years ago
ocornut c4562ac573 Fixed mouse click detection to be more friendly to DeltaTime 0.0 (#338) 9 years ago
ocornut 0abe668221 ImFontAtlas: Added TexDesiredWidth and tweaked default cheapo best-width choice(#327) 9 years ago
ocornut 2903c98bca Minor typo 9 years ago
ocornut b4f1e88860 Added ImGuiInputTextFlags_ReadOnly flag for InputText()/InputTextMultiline() (#211) 9 years ago
ocornut a09411b936 Demo: using MouseDelta 9 years ago
ocornut 965fa3cb16 Version number 1.46 WIP 9 years ago
ocornut c9e19f8953 Version number 1.45 9 years ago
ocornut e4ef140e10 Speculative Linux build fix, not using itoa (#246) 9 years ago
ocornut 350d96466e Demo: tweaks (#246) 9 years ago
ocornut 71026d3655 Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246) 9 years ago
ocornut e5e9c5cfbe Demo: removed extraneous flag in demo code + tweak comment (#246) 9 years ago
ocornut afa0346a0b Demo: using DragFloat instead of SliderFloat 9 years ago
ocornut f128a8bce1 ColumnsStartX include window->Scroll.x to simplify code (#246) 9 years ago
ocornut 9e5fb40ddd Demo: added horizontal scrolling example + enabled in console, log and child examples (#246) 9 years ago
ocornut d88b73a8b7 Added GetContentRegionAvailWidth() helper. Demo tweaks. 9 years ago
ocornut aa35547f94 Demo: long text example uses ImGuiListClipper 9 years ago
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!) 9 years ago
ocornut 62a3142036 Demo: comments. 9 years ago
ocornut e7cc048d81 Demo: custom rendering tweak. 9 years ago
ocornut 0a11024459 IO.WantInputCharacters -> WantTextInput (#305) 9 years ago
ocornut 8430c88451 Demo: added a bezier curve in the old custom rendering demo. 9 years ago
ocornut 80ad773c87 ImDrawList: added AddBezier(), PathBezierTo() for cubic bezier curves (#311) 9 years ago
ocornut b1987d697f Trim trailing whitespace (#305) 9 years ago
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input
Conflicts:
	imgui.cpp
9 years ago
ocornut 0a6d6da732 Demo: Log: removed unnecessary style change, 9 years ago
ocornut 67b2b5f3a9 Demo: Log: removed broken clipping, tweaks. 9 years ago
ocornut 07de0448f9 ImGuiTextFilter: default parameter width=0.0f for no override, allow override with negative values 9 years ago
ocornut b770f3ffaf Demo: Add filtering to log with better-than-none storage of line offsets. 9 years ago
ocornut 72d3fca52f Demo: added simple Log demo 9 years ago
ocornut d36a634ac8 Demo: Fixed incorrectly formed string passed to Combo (#298) 9 years ago
omar 9a97ef673e Merge pull request #296 from tpoechtrager/master
Fixes for compiling Windows target with non-MSVC compiler.
9 years ago
ocornut 6a90ac2094 Tentative GCC/Clang warning fixes with unused functions (cf #296) 9 years ago
Thomas Pöchtrager 3604aecf8f Minor Windows adjustments 9 years ago
ocornut 23e7bdebcf Warnings for clang (#295) 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 155873a6b0 Added GetContentRegionAvail() helper 9 years ago
ocornut 1befd21b37 Moved ShowUserGuide() after ShowTestWindow() (#219) 9 years ago
ocornut 3658314638 imgui_demo.cpp doesn't redefine functions from imgui_internal.h so all files can be unity-built (#219) 9 years ago
ocornut e47bf041bf Clang warning fixes 9 years ago
ocornut e1ac5a3198 Honor IMGUI_DISABLE_TEST_WINDOWS as described (#219) 9 years ago
ocornut 5a29eef1fa Fixed further warnings with GCC/Clang (#219) 9 years ago
ocornut dace68b6fd Big cleanup, split imgui.cpp into imgui_demo.cpp,imgui_draw.cpp imgui_internal.h (#219) 9 years ago