ocornut
|
ef10b984fe
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-08-23 17:00:47 +02:00 |
|
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.
|
2016-08-18 11:00:23 -07:00 |
|
ocornut
|
996eb080fa
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-08-11 22:53:26 +02:00 |
|
ocornut
|
de61fcc619
|
Minor bits
|
2016-06-25 17:03:49 +02:00 |
|
ocornut
|
1ef7980e17
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-06-15 10:05:17 +02:00 |
|
ocornut
|
4fddfa4b5e
|
Demo: extra (somehow duplicate) Selectables+Columns demo
|
2016-06-07 09:05:36 +02:00 |
|
ocornut
|
d6a5fd06d7
|
Demo: Added an extra 3-way columns demo
|
2016-06-07 08:46:50 +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
|
3ddb50a925
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-05-29 19:07:23 +02:00 |
|
ocornut
|
1483a69c11
|
Demo: Tree: showing how to align tree node label with current x position (#324, #581)
|
2016-05-28 19:30:01 +02:00 |
|
ocornut
|
a0a48f6e59
|
Added TreeAdvanceToLabelPos() (#581)
|
2016-05-28 18:15:54 +02:00 |
|
ocornut
|
806a146198
|
TreeNodeEx(): ImGuiTreeNodeFlags_AlwaysOpen->ImGuiTreeNodeFlags_Leaf, + added ImGuiTreeNodeFlags_Bullet (#324, #581)
|
2016-05-28 17:12:13 +02:00 |
|
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)
|
2016-05-28 14:18:46 +02:00 |
|
ocornut
|
8f4b123e1b
|
SetNextWindowSizeConstraint -> SetNextWindowSizeConstraints (#668)
|
2016-05-28 14:02:14 +02:00 |
|
ocornut
|
e3d8055d90
|
Speculative 64-bit warning fix (#668)
|
2016-05-21 23:13:11 +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
|
69a29e4715
|
Added NewLine() (very shy reminder that #97 isn't done)
|
2016-05-16 20:14:07 +02:00 |
|
ocornut
|
7a28f5bb81
|
ImGuiListClipper new version, detect height automatically, fix compatibility with SetScrollPosHere (#662)
|
2016-05-16 19:22:51 +02:00 |
|
ocornut
|
fa5ae60bce
|
Demo: added decorated label to some vertical sliders.
|
2016-05-16 12:05:26 +02:00 |
|
ocornut
|
339e191c53
|
Demo: Console: Add a "Scroll to bottom" button (#662)
|
2016-05-15 18:08:41 +02:00 |
|
ocornut
|
9e6ed0991d
|
Demo: clarified misleading example (#660)
|
2016-05-15 16:03:15 +02:00 |
|
ocornut
|
a2a5d71582
|
Demo: Tweak irritating pink color.
|
2016-05-12 23:13:54 +02:00 |
|
ocornut
|
b628acbb52
|
StyleEditor: comments (#652)
|
2016-05-12 20:59:20 +02:00 |
|
omar
|
10d3da6b73
|
Merge pull request #641 from cosmy1/errors-fix
Fix compilation errors when disabling test windows.
|
2016-05-12 13:41:05 +02:00 |
|
ocornut
|
8648346eab
|
Modal: fixed non-child window stacked over a modal losing its hoverabilty/focusability (#615, #604)
|
2016-05-10 17:02:10 +02:00 |
|
Branimir Karadžić
|
a59a04f4d0
|
Fixed iOS/OSX build.
|
2016-05-10 01:10:31 +02:00 |
|
cosmy1
|
4b5a4cae09
|
Fix compilation errors when disabling test windows.
|
2016-05-09 00:21:05 +02:00 |
|
Sergej Reich
|
6e8579fc14
|
Ignore implicit conversion warnings
|
2016-05-07 18:49:24 +02:00 |
|
ocornut
|
ce4d731486
|
Minor comments, tweaks
|
2016-05-07 18:10:32 +02:00 |
|
ocornut
|
79ad22e1f2
|
Fixed various Clang -Weverything warnings (#626)
|
2016-05-04 23:17:53 +02:00 |
|
ocornut
|
4ce6cf0512
|
Demo: Moved "Fonts" section style editor
|
2016-05-03 20:22:35 +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
|
bb674ccee6
|
TreeNode: added ImGuiTreeNodeFlags_AlwaysOpen flag (#581, #324)
|
2016-05-01 21:15:46 +02:00 |
|
ocornut
|
f79b2d6ce3
|
TreeNode: added ImGuiTreeNodeFlags_OpenOnArrow flag (#581, #324, #190)
|
2016-05-01 20:12:14 +02:00 |
|
ocornut
|
dc8446d048
|
Demo: Added simple tree node selection demo (#581, #516, #190)
|
2016-05-01 17:55:04 +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
|
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
|
7da2d51480
|
MenuBar fixed missing lower border
|
2016-04-24 22:36:46 +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
|
4c25de950c
|
Warning fixes for clang. Using int64_t, may be an issue?
|
2016-04-09 17:46:38 +02:00 |
|
cheriff
|
2ee76bbff6
|
Trivial format string fix in demo
|
2016-04-05 09:23:00 +02:00 |
|
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.
|
2016-04-04 01:37:02 +02:00 |
|
ocornut
|
4c1d4233b2
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-04-03 01:10:26 +02:00 |
|
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.
|
2016-04-02 18:22:40 +02:00 |
|
ocornut
|
326c4e40f8
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-28 23:17:13 +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
|
5bed7144fe
|
ImDrawList: Added AddTriangle() function
|
2016-03-22 20:10:06 +01:00 |
|
ocornut
|
a274a09955
|
Renamed GetWindowFont()->GetFont(), GetWindowFontSize()->GetFontSize() (related to #340)
|
2016-03-21 22:29:11 +01:00 |
|
ocornut
|
9cbc6e196b
|
ImDrawList: AddRect() added optional thickness parameter + updated demo
|
2016-03-21 21:56:23 +01:00 |
|
ocornut
|
459af7683c
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-03-04 13:57:33 +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
|
cf12bc7dea
|
InputText: Added BufTextLen in ImGuiTextEditCallbackData. Requesting user to maintain it. Zero-ing structure properly before use. (#541)
|
2016-03-02 23:34:29 +01:00 |
|
ocornut
|
ba80a457b9
|
Demo: plot code doesn't use ImVector to avoid heap allocation + comment (#538)
|
2016-02-29 12:53:05 +01:00 |
|
ocornut
|
4afe67cdc8
|
Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) (#536)
|
2016-02-24 11:50:21 +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
|
dafedc3246
|
Demo: use locally defined strdup because compilers/standard librairies are an annoyance (#520)
|
2016-02-08 08:44:45 +01:00 |
|
ocornut
|
2c6bc95dd5
|
Demo: InputText password demo filters out blanks (#515)
|
2016-02-03 09:24:57 +01:00 |
|
Nikolay Zapolnov
|
a908c109c0
|
Added flag for selectables to handle double clicks.
|
2016-01-31 22:08:35 +01:00 |
|
ocornut
|
bf6f6ba858
|
Demo: extra comments and example for PushItemWidth(-1)
|
2016-01-06 01:24:49 +01:00 |
|
ocornut
|
81c86dd5e7
|
Various minor fixes following a pass of cppcheck static analyzer
|
2015-12-30 11:55:37 +01:00 |
|
ocornut
|
68bde7b862
|
Clarify comment (#455)
|
2015-12-27 21:41:01 +01:00 |
|
ocornut
|
6dbdc69131
|
ImDrawList: Fixed AddCircle() to fit precisely within bounding box like AddCircleFilled() and AddRectFilled() (followup #457
|
2015-12-27 20:18:43 +01:00 |
|
ocornut
|
668a247af0
|
Demo: added more draw primitives in the Custom Rendering example (#457)
|
2015-12-27 19:49:31 +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
|
2e5352786a
|
Bullet(), BulletText(): vertical and horizontal alignment fixes (namely for widget sized line height). (followup to #414, #282)
|
2015-12-13 23:41:02 +00:00 |
|
ocornut
|
558430ca8f
|
TreeNode() fixed alignment of collapse arrow to it matches bullet (broken in 4006fb77bc)
|
2015-12-13 22:07:01 +00:00 |
|
ocornut
|
5084f90a0d
|
Added ProgressBar() (#333)
|
2015-12-13 21:41:45 +00:00 |
|
ocornut
|
02ce1a2b32
|
Demo: Display extra info from ImFontConfig in the font display
|
2015-12-13 16:15:11 +00:00 |
|
ocornut
|
18223fd3ab
|
Demo: Tweak window option and style display
|
2015-12-13 14:03:26 +00:00 |
|
ocornut
|
a9bdda0d95
|
Demo: Added style editor in demo menu + exposed WindowFillAlphaDefault
|
2015-12-13 13:36:00 +00:00 |
|
ocornut
|
a500c0daf7
|
Demo: some TreeNode layout examples (#414, #282)
|
2015-11-29 21:02:15 +00:00 |
|
ocornut
|
4006fb77bc
|
TreeNode,CollapsingHeader: sizing fixes to support laying out item on same line before/after (#414, #282)
|
2015-11-29 20:35:58 +00:00 |
|
ocornut
|
eb6575508f
|
Demo: Tweaked Clipping example.
|
2015-11-29 10:29:06 +00:00 |
|
ocornut
|
b2b4bbe5ea
|
Demo: Fixed variable shadowing warning.
|
2015-11-29 10:25:55 +00:00 |
|
ocornut
|
79b09e7d10
|
Fixed int>void* warnings for 64-bits architectures and fancy warnings
|
2015-11-29 10:20:50 +00:00 |
|
ocornut
|
ba77166432
|
Demo: comments (#414)
|
2015-11-28 17:23:32 +00:00 |
|
ocornut
|
32d2768734
|
Demo: Moved property editor demo to its own mini example applet (#414)
|
2015-11-28 17:16:59 +00:00 |
|
ocornut
|
d3df39fed1
|
Columns: Added Property Tree demo among tidying up demos (#125, #414)
|
2015-11-28 16:44:09 +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
|
92c518a420
|
InputText: Added password mode via ImGuiInputTextFlags_Password (#237, #363, #374)
|
2015-11-19 23:09:59 +01:00 |
|
ocornut
|
6b03ddbcb1
|
Demo: Made the "menu inside a regular window" be in a different menuset. Added a comment (#409)
|
2015-11-16 22:43:42 +01:00 |
|
ocornut
|
f87deff0f3
|
Moving stdlib.h include outside of imgui.h (#405)
|
2015-11-13 17:08:54 +01:00 |
|
ocornut
|
6ffe0fddbf
|
Examples: Fixed crash when both buttons are held (#393)
|
2015-10-30 15:01:26 +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
|
bc34ac882f
|
InputText: added comments and somehow clarified the optimized code that calculate text position + updated demo
|
2015-10-18 10:57:29 +01:00 |
|
ocornut
|
f21fda1231
|
Scrollbar: Tweaked scrollbar inner padding for small scrollbars.
|
2015-09-30 21:47:44 +02:00 |
|
ocornut
|
5d3d136733
|
Scrollbar: horizontal scrollbar demo allows to enable simultanaeous scrollbars on both axises.
|
2015-09-30 21:15:47 +02:00 |
|
ocornut
|
127f44c12b
|
Demo: Extra plotting examples.
|
2015-09-20 13:29:18 +02:00 |
|