omar
|
bf0d9c123e
|
Merge branch 'master' into navigation
|
2017-08-18 00:25:12 +08:00 |
|
omar
|
24a78767d2
|
Merge branch 'master' into styles
# Conflicts:
# TODO.txt
|
2017-08-17 17:24:33 +08:00 |
|
omar
|
52f1a4124c
|
Demo: Tweaked Fonts section.
|
2017-08-17 13:56:16 +08:00 |
|
omar
|
68bf5ecbc1
|
Marked the weird IMGUI_ONCE_UPON_A_FRAME helper macro as obsolete. prefer using the more explicit ImGuiOnceUponAFrame. Removed the broken __LINE__ from IMGUI_ONCE_UPON_A_FRAME
|
2017-08-16 17:51:44 +08:00 |
|
omar
|
668a4bf1bc
|
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
|
2017-08-15 17:48:41 +08:00 |
|
omar
|
18b50f8eba
|
Comments
|
2017-08-15 11:41:36 +08:00 |
|
omar
|
9bf5028fd3
|
Merge branch 'master' into navigation
|
2017-08-15 00:50:59 +08:00 |
|
omar
|
97fccbdb73
|
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
|
2017-08-14 13:05:03 +08:00 |
|
omar
|
5eef7dd82f
|
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
|
2017-08-12 00:43:55 +08:00 |
|
omar
|
73f9c9d80c
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
|
2017-08-11 13:44:25 +08:00 |
|
omar
|
7e452ec737
|
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
|
2017-08-11 13:36:28 +08:00 |
|
omar
|
059e838b2c
|
Merge branch 'master' into navigation
|
2017-08-08 18:04:38 +08:00 |
|
omar
|
be9628494a
|
Demo: Rearranged everything under Widgets in a more consistent way.
|
2017-08-08 18:04:31 +08:00 |
|
omar
|
d888de4483
|
Demo: Merged a few demo tweaks from navigation branch to minimize drift.
|
2017-08-08 17:49:12 +08:00 |
|
omar
|
30d1e5712a
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
|
2017-08-08 17:30:32 +08:00 |
|
omar
|
942cb0e1f2
|
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). (#346)
|
2017-08-08 15:54:20 +08:00 |
|
omar
|
d952a8d3bf
|
Demo: Color widget demo tweaks (#346)
|
2017-08-08 14:49:45 +08:00 |
|
omar
|
03700ad15e
|
Merge remote-tracking branch 'origin' into 2016-07-navigation
|
2017-08-07 22:51:18 +08:00 |
|
omar
|
1c991b525a
|
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
|
2017-08-07 22:34:30 +08:00 |
|
omar
|
e36b41cbd0
|
Fixed Y scroll aiming when Horizontal Scrollbar is enabled (#665). Tweak log demo.
|
2017-08-07 21:53:57 +08:00 |
|
omar
|
233a6efeba
|
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). (#1271)
|
2017-08-07 18:35:15 +08:00 |
|
omar
|
cdea8ca94f
|
Demo: Comment about 'static' and some tweaks (#1267)
|
2017-08-06 11:07:52 +08:00 |
|
omar
|
f6460970c5
|
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). (#346)
|
2017-07-31 21:20:42 +08:00 |
|
omar
|
3075d8bcd4
|
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). (#346)
|
2017-07-30 23:08:43 +08:00 |
|
omar
|
91a4f5df25
|
Demo: Tweaks
|
2017-07-30 18:28:59 +08:00 |
|
omar
|
90fcd4a829
|
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview (#346)
|
2017-07-30 17:55:42 +08:00 |
|
omar
|
4d844ffde1
|
Demo: custom ColorPicker popup example tweaks (#346)
|
2017-07-30 17:43:19 +08:00 |
|
omar
|
f040547a5f
|
Demo: custom ColorPicker popup example (#346)
|
2017-07-30 17:37:28 +08:00 |
|
omar
|
fef8aac523
|
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. (#346)
|
2017-07-30 16:15:52 +08:00 |
|
omar
|
35186a1165
|
Demo: Comments (#346)
|
2017-07-29 17:35:24 +08:00 |
|
omar
|
3926bd08e1
|
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. (#346)
|
2017-07-29 17:23:32 +08:00 |
|
omar
|
6bc1572d31
|
ColorPicker: Comments. Single input value mode allow access to context-menu options. (#346)
|
2017-07-29 15:50:24 +08:00 |
|
omar
|
973d4a361b
|
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. (#346)
|
2017-07-29 14:32:41 +08:00 |
|
omar
|
cdcda9ff68
|
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. (#346)
|
2017-07-29 14:01:05 +08:00 |
|
omar
|
c36d59a42a
|
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. (#346)
|
2017-07-27 17:16:46 +08:00 |
|
omar
|
b7a563276d
|
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. (#346)
|
2017-07-27 11:07:46 +08:00 |
|
omar
|
2e37db9002
|
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 (#346)
|
2017-07-27 10:49:01 +08:00 |
|
omar
|
6796e771fd
|
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag (#346). Reorder flags again.
|
2017-07-26 16:28:01 +08:00 |
|
omar
|
d29a4c5e5c
|
Demo: Removed the color button from the context menu example because it is misleading now that our color widget have tooltip/context menus themselves. (#346)
|
2017-07-26 16:00:47 +08:00 |
|
omar
|
7b2d79cffd
|
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. (#346)
|
2017-07-23 18:44:32 +08:00 |
|
omar
|
4def2ce339
|
ColorPicker: Demo tweaks (#346)
|
2017-07-23 17:55:39 +08:00 |
|
omar
|
790d0eb5be
|
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option (#346)
|
2017-07-22 19:24:39 +08:00 |
|
omar
|
91bf8fd689
|
ColorPicker,ColorEdit: Demo code (#346)
|
2017-07-22 18:01:29 +08:00 |
|
omar
|
c8553817d9
|
Merge branch 'master' into 2016-02-colorpicker
|
2017-07-21 02:34:19 +08:00 |
|
omar
|
100d30a0a1
|
Comments about IMGUI_DISABLE_TEST_WINDOWS (#1240, #169)
|
2017-07-20 23:12:58 +08:00 |
|
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 |
|