omar
|
99c7622a1b
|
ItemAdd(), not performing computation for IsItemRectHovered() which does them itself, allowing us in the next commit to optimize ItemAdd() and make its logic more consistent with IsHovered().
|
2017-09-27 16:20:53 +02:00 |
|
omar
|
8fd4beddb8
|
Merge branch 'master' into navigation
|
2017-09-26 20:28:40 +02:00 |
|
omar
|
9e1ad7295f
|
ImFont: Renamed (supposedly internal) fields (e.g. XAdvance to AdvanceX). Custom text renderers might be affected if they didn't use the GetCharAdvance() helper function.
|
2017-09-26 20:05:16 +02:00 |
|
omar
|
10bb9524eb
|
ImFont: Renamed ImFont::Glyph to ImFontGlyph (for consistency and so ImFontAtlas types can use it without ordering half of the file). Left a redirection type.
|
2017-09-26 19:54:30 +02:00 |
|
omar
|
7e8069dd23
|
Merge branch 'master' into navigation
|
2017-09-25 22:08:38 +02:00 |
|
omar
|
a34edb810e
|
Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes)
|
2017-09-25 21:12:07 +02:00 |
|
omar
|
4b82759598
|
SetNextWindowPos: added a ImVec2 pivot parameter for positioning a given a center, bottom-right position, etc. As a generalization of SetNextWindowPosCenter() which is now obsolete. This will be useful for combo-like popups as well.
Demo: Simple-overlay window uses the SetWindowPos pivot to select a corner to position itself at.
|
2017-09-25 18:25:43 +02:00 |
|
omar
|
1ff27d7db8
|
Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. (#787)
|
2017-09-18 16:04:28 +02:00 |
|
omar
|
44e8d94aba
|
Merge branch 'master' into navigation
|
2017-09-18 15:32:31 +02:00 |
|
omar
|
709653c330
|
Merge branch 'master' into styles
|
2017-09-18 15:03:25 +02:00 |
|
omar
|
38ed66f55e
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_demo.cpp
|
2017-09-06 19:25:07 +02:00 |
|
omar
|
9e2f202f05
|
Demo: Not using the undesirable Begin() overload.
|
2017-09-06 19:24:08 +02:00 |
|
omar
|
5c4fda0fbc
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2017-09-06 19:17:51 +02:00 |
|
omar
|
6a1ba317c7
|
Demo: Minor coding style tweaks so bgfx copy needs less patching.
|
2017-08-29 19:05:56 +08:00 |
|
omar
|
807322c9a5
|
Merge branch 'master' into navigation
# Conflicts:
# imgui.cpp
|
2017-08-26 18:43:10 +08:00 |
|
omar
|
37f3a718c6
|
Marked all fmt + va_list functions with format attribute so GCC/Clang can warn about them. Not ignoring -Wsuggest-attribute=format anymore for GCC/Clang.
|
2017-08-25 16:10:14 +08:00 |
|
omar
|
40f608ce9b
|
Version 1.52 WIP
|
2017-08-25 15:12:12 +08:00 |
|
omar
|
55a6209931
|
Version 1.51
|
2017-08-25 00:29:59 +08:00 |
|
omar
|
82c3116b4f
|
Demo: Displaying version number in test window.
|
2017-08-24 17:32:03 +08:00 |
|
omar
|
444792f75f
|
Merge fixes from ,master branch
|
2017-08-22 18:27:23 +08:00 |
|
omar
|
53e73182ff
|
Merge branch 'master' into navigation
# Conflicts:
# imgui_internal.h
|
2017-08-21 00:04:45 +08:00 |
|
omar
|
54bdd00df7
|
Columns: Fix for explicit content width and scrollbar. (#519, #125)
|
2017-08-20 21:32:18 +08:00 |
|
omar
|
1ebd7ec049
|
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. (#519, #125, #913)
|
2017-08-20 20:58:24 +08:00 |
|
omar
|
19a42cb2fd
|
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. (#125)
|
2017-08-20 18:44:48 +08:00 |
|
omar
|
bc78535bbf
|
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
# Conflicts:
# imgui.cpp
# imgui.h
|
2017-08-20 18:22:34 +08:00 |
|
omar
|
b4eeb4aa8d
|
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
|
2017-08-20 17:53:09 +08:00 |
|
omar
|
91d841dd5f
|
Added PushStyleColor(ImGuiCol idx, ImU32 col) overload. (Which _might_ cause an "ambiguous call" compilation error if you are using ImColor() with implicit cast. Cast to ImU32 or ImVec4 explicily to fix.)
|
2017-08-20 15:28:12 +08:00 |
|
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 |
|