omar
|
3e4cb40d45
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-19 14:53:25 +08:00 |
|
omar
|
8261d9ff30
|
Comments (#1172, #1231)
|
2017-07-15 17:11:53 +08:00 |
|
omar
|
12d265fa31
|
Version 1.51 WIP tag
|
2017-06-13 11:30:22 +02:00 |
|
omar
|
5e1caaaef3
|
Version 1.50
|
2017-06-02 12:22:34 +02:00 |
|
omar
|
8228dc20df
|
Merge branch 'master' into 2016-07-navigation
|
2017-05-26 13:44:08 +02:00 |
|
omar
|
c038339a4c
|
Merge branch 'master' into 2015-02-colorpicker
|
2017-05-26 13:43:36 +02:00 |
|
omar
|
026d021df1
|
Demo: Fixed warnings introduced in 0828a1fd6c
|
2017-05-26 13:40:53 +02:00 |
|
omar
|
0828a1fd6c
|
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
|
2017-05-14 16:27:10 +02:00 |
|
omar
|
497381dc3d
|
Comments
|
2017-05-01 15:53:50 +02:00 |
|
omar
|
89b1497843
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-05-01 12:37:34 +02:00 |
|
omar
|
288dccd5a5
|
Merge branch 'master' into 2016-07-navigation
|
2017-03-17 21:30:16 +01:00 |
|
omar
|
e10ceebd36
|
ImFont: Store the texture surface used to get an idea of how costly each font is.
|
2017-03-17 21:29:57 +01:00 |
|
omar
|
b6c0227add
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-01-11 21:03:35 +01:00 |
|
omar
|
c76be71acf
|
Merge branch 'master' into 2016-07-navigation
|
2017-01-11 21:03:25 +01:00 |
|
omar
|
714beb217c
|
Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.
|
2017-01-07 20:18:45 +01:00 |
|
ocornut
|
68df09cf47
|
Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)
|
2017-01-01 20:11:40 +01:00 |
|
ocornut
|
a60b2cc645
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-12-23 12:15:58 +01:00 |
|
ocornut
|
fdc70456f4
|
Merge branch 'master' into 2016-07-navigation
|
2016-12-23 12:13:52 +01:00 |
|
ocornut
|
52308a54f8
|
Demo: comments
|
2016-12-12 11:05:41 +01:00 |
|
ocornut
|
3028ccc25b
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-11-27 18:25:20 +01:00 |
|
ocornut
|
f4cf972ea9
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-11-27 18:21:14 +01:00 |
|
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.
|
2016-11-13 23:58:09 -08:00 |
|
ocornut
|
fdbad2708c
|
Ignore GCC 6 warnings (#883)
|
2016-11-12 21:04:55 +01:00 |
|
ocornut
|
775ac24d45
|
Fixed overzealous GCC warnings (#883) + partly undo 8553bab241
|
2016-11-12 11:14:37 +01:00 |
|
ocornut
|
8553bab241
|
Ignoring overzealous GCC warnings (#883)
|
2016-11-11 20:17:35 +01:00 |
|
ocornut
|
941cf1b436
|
Merge branch 'master' into 2016-07-navigation
|
2016-11-09 15:21:36 +01:00 |
|
ocornut
|
ccb3db94da
|
Merge branch 'master' into 2016-02-colorpicker
|
2016-11-09 15:17:20 +01:00 |
|
ocornut
|
faafcf418d
|
Demo: Comments, even though nobody appears to read the comments.
|
2016-11-07 17:33:46 +01:00 |
|
ocornut
|
b2f0ea6c0d
|
Font: Default font given explicit name "ProggyClean.ttf"
|
2016-11-06 21:51:20 +01:00 |
|
ocornut
|
b376b68326
|
Font: Added io.FontDefault in ImGuiIO structure to make it easier to change default font from third-party or demo code
|
2016-11-06 21:50:18 +01:00 |
|
ocornut
|
357167f917
|
Demo: Custom Rendering: Tweak so end of line can be dropped outside of canvas, more pleasing.
|
2016-11-06 18:13:14 +01:00 |
|
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
|
2016-10-16 12:21:38 -04:00 |
|
ocornut
|
e4deb7a190
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-10-07 09:52:14 +02:00 |
|
ocornut
|
404979e48d
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-10-07 09:52:00 +02:00 |
|
Jeongseok Lee
|
1d7e05327b
|
Fix clang warning: unknown warning group '-Wreserved-id-macro'
|
2016-10-06 14:48:47 -04:00 |
|
Michał Cichoń
|
1999c01db8
|
Apply Omar feedback and convert remaining 0xAABBGGRR's into IM_COL32(RR,GG,BB,AA) format.
|
2016-09-26 12:00:33 +02:00 |
|
ocornut
|
82dcdc9dfc
|
ShowStyleEditor: tweak font map display to show glyph details when hovered.
|
2016-09-25 15:52:04 +02:00 |
|
ocornut
|
f5b37dbc52
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 15:31:36 +02:00 |
|
ocornut
|
fea0fcb7c3
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 15:25:55 +02:00 |
|
ocornut
|
d7c518e6cc
|
ShowStyleEditor: show font map / grid in more details.
|
2016-09-25 15:22:41 +02:00 |
|
ocornut
|
ed279c0095
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-09-25 12:59:24 +02:00 |
|
ocornut
|
1b5bbf725b
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-09-25 12:57:22 +02:00 |
|
ocornut
|
56cdbe434d
|
Style: Added ButtonTextAlign, ImGuiStyleVar_ButtonTextAlign (#842)
|
2016-09-25 12:53:13 +02:00 |
|
ocornut
|
612b17ef57
|
Fixing minor english typos (#827)
|
2016-09-11 22:02:35 +02:00 |
|
ocornut
|
ef10b984fe
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2016-08-23 17:00:47 +02:00 |
|
ocornut
|
67fd805839
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2016-08-21 16:13:40 +02:00 |
|
ocornut
|
252f094101
|
Nav: Undo 87eb749cbc, agressively including nav focus test in IsItemHovered() (#323)
|
2016-08-21 15:26:40 +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
|
785f51227a
|
Demo tweaks
|
2016-08-07 19:07:24 +02:00 |
|
ocornut
|
dcff032429
|
Nav: Moving all nav inputs to io.NavInputs[] float array, new enum labelled for gamepad. (#323)
|
2016-08-03 23:23:04 +02:00 |
|
ocornut
|
4e91b521ee
|
Demo: Arrange some inputs panels.
|
2016-08-03 20:55:54 +02:00 |
|
ocornut
|
d0801057ba
|
Demo: Tweak handling of "animate" flag in graph demo so it doesn't keep running.
|
2016-08-01 20:55:54 +02:00 |
|
ocornut
|
a154625a56
|
Nav: Not exposing ImGuiWindowFlags_NavFlattened because it requires much more work (#323)
|
2016-07-31 13:40:14 +02:00 |
|
ocornut
|
b3cba62b80
|
Nav: Added experiment ImGuiWindowFlags_NavFlattened flag to cross over between parent and non-scrolling child windows (#323)
|
2016-07-31 12:55:23 +02:00 |
|
ocornut
|
d88dcc26cc
|
Demo: console text input keeps focus in a less harsher and more navigation friendly way (#323)
|
2016-07-30 19:17:26 +02:00 |
|
ocornut
|
e2dd48ae65
|
Nav: Split _NoNav window flag into _NoNavInputs and _NoNavFocus (#323)
|
2016-07-30 18:06:05 +02:00 |
|
ocornut
|
04157da291
|
Nav: first committed pass for manual moving and manual scrolling (after a bunch of attempts) (#323)
|
2016-07-30 17:18:34 +02:00 |
|
ocornut
|
c2cb2a6928
|
Gamepad/Keyboard navigation support, initial commit, WIP (#323)
|
2016-07-20 00:02:59 +02:00 |
|
ocornut
|
e72e3b2cbc
|
Demo: tweaks.
|
2016-07-18 18:22:06 +02:00 |
|
ocornut
|
91e1c56da6
|
Minor bits.
|
2016-07-18 15:25:59 +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 |
|