mirrors
/
imgui
mirror of https://github.com/ocornut/imgui
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,777 Commits 9 Branches 125 Tags 306 MiB
Commit Graph

164 Commits

Author SHA1 Message Date
ocornut c4db79f34b Member variable name renamed "ID" "Id" for casing consistency 2016-06-12 22:27:15 +02:00
ocornut d1c073a199 Comments, tweaks 2016-05-31 00:00:44 +02:00
ocornut 5d4cf1c3f3 Version 1.50 WIP 2016-05-30 19:38:36 +02:00
ocornut adb85d800d Version 1.49 2016-05-29 19:16:44 +02:00
ocornut 9a751da136 Caving in to ignoring stupid pedantic Clang warnings for old-style-cast in header files 2016-05-29 19:14:19 +02:00
ocornut 3ddb50a925 Merge branch 'master' into 2016-02-colorpicker 2016-05-29 19:07:23 +02:00
ocornut 45dacbf084 Fixed GetWindowContentRegionMax() being off by ScrollSize amount when SizeExplicit is set + caching ContentsRegionRect. 
Relates to horizontal scrollbar, explicit contents size
 2016-05-29 17:50:23 +02:00
ocornut b7ebeb1610 Added SetNextWindowSizeConstraint() + demo code (#668) 2016-05-21 22:53:08 +02:00
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.
 2016-05-21 20:50:15 +02:00
ocornut b630cb5b42 ImGuiWindow: Storing ParentWindow (#615, #646) 2016-05-10 17:00:42 +02:00
ocornut 7b9c0a5c3f Renamed ImGuiState -> ImGuiContext (#586, #269) 2016-05-07 19:55:51 +02:00
ocornut 8b428e8c74 Added CreateContext/DestroyContext/GetCurrentContext/SetCurrentContext() (#586, #269) 2016-05-07 19:54:27 +02:00
ocornut ce4d731486 Minor comments, tweaks 2016-05-07 18:10:32 +02:00
ocornut 313d388bba Reorganised windows moving code, documented a lag in FindHoveredWindow(), fixing lag whole moving windows (#635) 2016-05-06 11:31:32 +02:00
ocornut 89d5026187 Renamed majority of use of "opened" to "open" for clarity. Renamed SetNextTreeNodeOpened() to SetNextTreeNodeOpen(). (#625, #579) 2016-05-02 12:32:16 +02:00
ocornut 9733f4fa24 Internal RenderBullet() helper. 2016-05-01 20:19:28 +02:00
ocornut 547f34cf22 Refactor ButtonBehavior(), fixed double-click mode also triggering on single-click (relate to #516) 2016-05-01 17:43:51 +02:00
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).
 2016-05-01 14:34:55 +02:00
ocornut 7406d64c64 PushClipRect(): not altering passed values, leave it to caller responsibility to floor properly (followup #582) 2016-04-30 18:55:23 +02:00
ocornut c5149cd53c MenuItem(): checkmark render in disabled color when disabled 2016-04-27 23:34:24 +02:00
ocornut 6bcc31e575 Merge branch 'master' into 2016-02-colorpicker 2016-04-26 11:06:24 +02:00
ocornut ea6b615179 Made ImGui::PushClipRect()/PopClipRect() public. Changed ImDrawList::PushClipRect() prototype. Fixed demo. (#610) 2016-04-26 11:03:51 +02:00
ocornut 41215534d5 Internal ImRound() -> ImFloor(), ImRect::Round() -> ImRect::Floor(), 2016-04-23 14:10:36 +02:00
ocornut 7ce6c18bbe Refactored CloseWindowButton() into a CloseButton() helper declared in imgui_internal.h (#600) 2016-04-21 09:55:02 +02:00
ocornut ab4a69bcd4 Comments 2016-04-19 18:31:40 +02:00
ocornut fc3b8d0a56 Relative order of Child windows creation is preserved during sort (#595) 2016-04-19 18:31:25 +02:00
ocornut 77177c18f0 Merge branch 'master' into 2016-02-colorpicker 2016-04-09 19:12:03 +02:00
ocornut 1588eda1ac Version 1.49 WIP 2016-04-09 19:10:42 +02:00
ocornut 95cbcdca3f Version 1.48 2016-04-09 17:46:48 +02:00
ocornut 4c1d4233b2 Merge branch 'master' into 2016-02-colorpicker 2016-04-03 01:10:26 +02:00
ocornut d53c308852 Moved EndFrame() back to imgui_internal.h + comments. Undo cfbf06e394 2016-04-03 00:47:41 +02:00
ocornut 326c4e40f8 Merge branch 'master' into 2016-02-colorpicker 2016-03-28 23:17:13 +02:00
ocornut cfbf06e394 Comments and moved EndFrame() for imgui_internal.h (for clarity? or extra confusion?) 2016-03-27 10:38:14 +02:00
ocornut 2b7eeba143 Trim trailing spaces 2016-03-26 15:38:52 +01:00
ocornut baabe3b62c Merge branch 'master' into 2016-02-colorpicker 2016-03-23 10:50:37 +01:00
ocornut 928832a5bc Various tidying up / comments, moved columns functions declarations, no functional changes 2016-03-21 22:11:43 +01:00
Kyle Rocha b8fcb4e7e4 Converted tabs to spaces 2016-03-21 12:40:02 -07:00
Kyle Rocha 3f46d9b933 Renamed FindTextDisplayEnd to FindRenderedTextEnd 2016-03-21 12:33:48 -07:00
Kyle Rocha 5bffc85ba6 Exposed FindTextDisplayEnd to imgui_internal.h 2016-03-21 12:07:13 -07:00
ocornut 459af7683c Merge branch 'master' into 2016-02-colorpicker 2016-03-04 13:57:33 +01:00
ocornut 2065cbec4d Removed extraneous comma for pedantic compilers (#516) 2016-03-03 00:34:06 +01:00
ocornut b816d05e33 Minor tidying up following (#516) - renamed ImGuiSelectableFlags_HandleDoubleClick to ImGuiSelectableFlags_AllowDoubleClick + comments 2016-03-03 00:30:08 +01:00
ocornut 6846873f23 Merge branch 'master' of https://github.com/zapolnov/imgui into zapolnov-master 2016-03-03 00:18:58 +01:00
ocornut d45044fe54 CaptureKeyboardFromApp() / CaptureMouseFromApp(): allow to enforce clearing the capture flag (#533) + demo + made code a little less messy 2016-03-03 00:09:41 +01:00
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
 2016-02-21 23:23:30 +01:00
ocornut 339b67c01a Exposed FindWindowByName() in imgui_internal.h 2016-02-20 17:37:36 +01:00
ocornut b329a36d27 Moved declaration of SetItemAllowOverlap() to imgui.h (ref #517) 2016-02-02 19:52:30 +01:00
Nikolay Zapolnov a908c109c0 Added flag for selectables to handle double clicks. 2016-01-31 22:08:35 +01:00
ocornut 7afd62ec57 Tentative fix for GCC/Clang (#484, #504) 2016-01-25 21:45:45 +00:00
ocornut 595684e08c Remove dependency on <new> header (#484, #504) 
(Now expecting something to fail somewhere..)
 2016-01-25 21:26:53 +00:00
ocornut 005b897d7d ProgressBar() handling of border size + storing border size in window structure (#503) 2016-01-24 11:00:37 +00:00
ocornut 3922988dea TreeNode(), CollapsingHeader() fixed not being to use "##" sequence in formatted label. 
Removed DisableHideTextAfterDoubleHash hack used by Metrics window.
 2016-01-16 12:25:40 +00:00
ocornut 4e3c6f64c0 Various minor fixes following a pass of cppcheck static analyzer 2015-12-30 11:45:13 +01:00
ocornut dc4a07c49a Fixed various Clang -Weverything warnings 2015-12-26 14:59:07 +01:00
ocornut e41568f87f Version number 1.48 WIP + Update binaries 2015-12-26 10:02:57 +01:00
ocornut 24d186753e Version number 1.47 2015-12-25 22:44:03 +01:00
ocornut e4cf44e967 Minor rebranding "ImGui" -> "dear imgui" (#21) 2015-12-24 20:00:50 +01:00
ocornut 40ddf8e287 Exported high-level versions of PushClipRect / PopClipRect to imgui_internal.h (#448) 2015-12-24 14:47:11 +01:00
ocornut 6102aa1375 BeginPopupContextWindow() and BeginPopupContextVoid() reopen window on subsequent click (#439) 2015-12-20 23:39:47 +01:00
ocornut 66886405f6 Minor comment (#439) 2015-12-20 23:32:24 +01:00
ocornut 9b6b1bc0f3 Added GetColorU32 helpers (previously internal and misplaced as window->Color()) 2015-12-13 19:32:37 +00:00
ocornut ecc97bda7d Added SetItemAllowOverlap() exposed in imgui_internal.h only 2015-12-03 21:30:17 +00:00
ocornut 9dca2ca960 Comments & spacing 2015-11-29 22:01:26 +00:00
ocornut 6269859315 Replace OS IME (Input Method Editor) cursor on top-left when we are not text editing. 2015-11-29 14:15:07 +00:00
ocornut 4ca34a879d Columns: Fixed bug with indentation within columns, also making code shorter/faster (#414, #125) 2015-11-28 16:36:25 +00:00
ocornut 807d4ff92c Columns: minor tidying up while investigating severe issues with indenting within columns (#414) 2015-11-28 12:14:50 +00:00
ocornut 1aac69c937 Columns: tidying up, moving OffsetT to a ImGuiColumnData structure 2015-11-26 23:01:15 +00:00
ocornut 3102c0c97e Rename internal ColumnsStartX to IndentX, makes more sense 2015-11-26 22:43:21 +00:00
ocornut 92c518a420 InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374) 2015-11-19 23:09:59 +01:00
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)
 2015-11-10 17:06:37 -06:00
ocornut 1a42a3f91b Refactor internal SliderBehavior() to take flags instead of a bool. 
Sorry!
 2015-10-30 11:43:23 +01:00
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.
 2015-10-30 11:36:51 +01:00
ocornut 5f0db60a57 Version number 1.47 WIP 2015-10-18 20:13:01 +01:00
ocornut 72dde4d323 Version 1.46 2015-10-18 17:36:27 +01:00
ocornut 7a61b7dd57 Renamed Window LastFrameDrawn to LastFrameActive, more correct 2015-10-18 16:57:10 +01:00
ocornut 43ff5a41be InputText(): always use live input data for display in read-only mode (fix #360) 2015-10-18 15:50:46 +01:00
ocornut d087671369 HoveredId is set via a SetHoveredID() function. Added HoveredIdAllowHoveringOthers not used by default API. 2015-10-06 19:27:24 +02:00
ocornut 98465d401b Silencing inadequate MSVC warnings when exporting as DLL (#345) 2015-09-22 00:53:51 +02:00
ocornut 3b01b0a2f2 Extracted a EndFrame() function out of Render() but kept it internal/private + clarified some asserts (#335) 2015-09-16 23:48:42 +01:00
ocornut 7b1168eb30 Internal ImLoadFileToMemory() return void* instead of taking void** + allow optional int* file_size 2015-09-11 16:01:54 +01:00
ocornut 07776595c2 Added missing IMGUI_API definitions in imgui_internal (fix #326) 2015-09-10 10:22:17 +01:00
ocornut f5fb5f0c1e Minor tidying, reordering functions/members/initialisation to follow same orders 2015-09-07 23:39:36 +01:00
ocornut dafad3903e Added GetDrawData() alternative to setting a Render function. 2015-09-07 14:56:39 +01:00
ocornut 965fa3cb16 Version number 1.46 WIP 2015-09-02 19:09:19 +01:00
ocornut c9e19f8953 Version number 1.45 2015-09-01 20:34:10 +01:00
ocornut 71026d3655 Added GetScrollX(), GetScrollX(), GetScrollMaxX() apis + demo (#246) 2015-08-30 18:33:38 +01:00
ocornut a3cad2ff06 BeginChild() fixed missing rounding for child sizes which leaked into layout 2015-08-30 18:06:54 +01:00
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.
 2015-08-30 16:37:56 +01:00
ocornut fc13ae2aa5 Turning float ScrollY into ImVec2 Scroll - no feature change, this is just to remove some syntax noise from the following commit (#246) 2015-08-30 15:08:13 +01:00
ocornut b326c8fd1f Added GetCurrentWindowRead() for functions that don't write to the window 2015-08-30 11:56:04 +01:00
ocornut 2d565d4bfb Style: rename ScrollbarWidth to ScrollbarSize (sorry!) 2015-08-29 23:47:47 +01:00
ocornut 65fe60f2b2 Split tree/collapsable into internal TreeNodeBehaviorIsOpened() helper (unsure..) (#282) 2015-08-29 18:13:30 +01:00
ocornut ad3c9f620d Tabs to spaces 2015-08-25 12:40:40 +01:00
ocornut b1987d697f Trim trailing whitespace (#305) 2015-08-24 13:50:18 +02:00
ocornut 425c6cb3a3 Remove CaptureInputCharactersFromApp and minor cleanups (#305) 2015-08-24 13:47:27 +02:00
Borislav Stanimirov 73917115a8 Added flag showing whether the GUI wants text input 
Conflicts:
	imgui.cpp
 2015-08-24 13:44:43 +02:00
ocornut 4ac4d1ac37 ImHash: defaults seed to zero + comment. 2015-08-18 19:17:09 -06:00
ocornut 97be3428f1 Added GetMousePosOnOpeningCurrentPopup(). 2015-08-15 15:10:07 -06:00
ocornut 42567a9516 ImGuiTextFilter::PassFilter() supports string range. Added [] helper to ImGuiTextBuffer. 2015-08-13 21:25:32 -06:00
ocornut f1f4d68f7f Prevent imgui_internal.h from being included without imgui.h (piles of errors) 2015-08-10 10:26:39 -06:00