a20fe279c5
Demo: Layout: Removed unnecessary BeginChild/EndChild calls
7 years ago
9191b17218
Merge branch 'master' into navigation
7 years ago
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
7 years ago
2543807e56
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
3f5b2a3fe3
Exposed ImDrawCornerFlags, replaced occurences of ~0 with an explicit ImDrawCornerFlags_All. Inversed BotLeft (prev 1<<3, now 1<<2) and BotRight (prev 1<<2, now 1<<3).
7 years ago
3c5e64db78
Demo: Tweaked Image() code.
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
28a31997b7
Style Editor: Simplified settings also show PopupBorderSize as a checkbox. ( #707 , #1019 )
7 years ago
abbf836fd0
Style, Begin: removed ImGuiWindowFlags_ShowBorders window flag. Borders are now fully set up in the ImGuiStyle structure (see e.g. style.FrameBorderSize, style.WindowBorderSize). Use ImGui::ShowStyleEditor() to look them up. ( #707 , fix #819 , #1031 , ref #1019 , ref #447 )
7 years ago
4cdd998be8
Demo: Fix warning "format not a string literal and no format arguments" for over-zealous compilers settings. ( #1450 , #1451 )
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
7 years ago
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
7 years ago
e7e81b265d
Demo: Tweaks.
7 years ago
1c41603b31
Style Editor: Using local storage so Save/Revert button made some more sense without code passing its storage. Tweaked layout, added horizontal scroll bar, Fixed Save/Revert button to be always accessible. ( fix #1211 )
7 years ago
c1b5eab868
Style Editor: Sneakily adding a combo box to change colors ( #707 )
7 years ago
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
7 years ago
6817f3a3d9
Merge branch 'master' into navigation
7 years ago
27fd1b913b
Made it guaranteed by API that after calling Begin() the last Item represent the title bar. ( #823 )
7 years ago
64031852de
Merge branch 'master' into navigation
7 years ago
6001d9c7a4
Columns: Clipping columns borders on Y axis on CPU because some GPU drivers appears to be unhappy with triangle spanning large regions (not sure why tbh). ( #125 )
...
Demo: Columns: Adding a billion of extra lines and using clipper.
7 years ago
0858c3d7cb
Demo: Custom Rendering: Fixed clipping rectangle extruding out of parent window.
7 years ago
a297cbafdb
Merge branch 'master' into navigation
7 years ago
8e6adc78af
Examples: Constrained Resize: Added more test cases (for #1417 )
7 years ago
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
59323b54da
Demo: Comments ( #1408 )
7 years ago
6ab20ff9bf
Minor tweaks to the user guide.
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
9f200d10d5
Version 1.52
7 years ago
fc25881207
Merge branch 'master' into navigation
7 years ago
1f3372b7f1
ImFormatString, ImFormatStringV(): clarifying specs so that passing a NULL buffer should return the desired length. ( #1038 )
7 years ago
d769e2515a
Merge branch 'master' into navigation
7 years ago
fce41d0b55
Demo: Fixed Fonts "set as default button" not having collading id on collapsed nodes.
7 years ago
e4bb9102f9
Merge branch 'master' into navigation
7 years ago
6ab737a4bb
Popups: Fixed right-click to close popups not handling modal windows properly. (~#439)
7 years ago
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
695ea45fca
IsWindowHovered(): Changed default behavior to now return false is a widget from another window is active + Added support for ImGuiHoveredFlags_AllowWhenBlockedByActiveItem. (relate to drag'n drop idoms: #143 )
7 years ago
564ff2dfd3
IsItemHovered(), IsWindowHovered(): added flags to enable various and more specific behavior. Will enable improvements for popups/context menus and drag'n drop. (relate ~#439, #1013 , #143 , #925 )
...
The legacy confusing IsItemRectHovered(), IsWindowRectHovered() can be completely removed now.
Changed IsWindowHovered() behavior with default parameter: it now return false is the window is blocked by a popup.
Demo: Added tests for those two functions.
7 years ago
2a32a2e662
Demos: Tweaks of popups/context/menus section.
7 years ago
a03093b2d4
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
29a652adee
CollapsingHeader(bool*) variant: fixed for IsItemHovered() to work properly in the nav branch.Basically the close button now has to use ItemAdd() to be navable into, which overwrite the IsItemHovered data. ( #600 , #787 )
7 years ago
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
2739b6ebcd
Begin: Work toward obsoleting the 5-arguments Begin() overload. Removed bg_alpha from internal BeginEx(). (3)
7 years ago
1a35766356
BeginPopupContextItem() now supports a NULL string identifier and uses the last item ID if available. For interactive items (that have an ID) this works! For non interactive items we assert.
7 years ago
3833f1f7a2
Merge branch 'master' into navigation
7 years ago
43b4a81b3e
Rnamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
7 years ago
c6e370a77a
TreeNode: Added ImGuiTreeNodeFlags_FramePadding flag
7 years ago
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
7 years ago
518f02f4de
Demo: better demo for SetKeyboardFocusHere()
7 years ago
0046c618b0
Nav: Allow to collapse tree nodes with NavLeft and open them with NavRight ( #787 , #1079 )
7 years ago
cf308f4039
Nav: Fixed SetItemDefaultFocus from stealing default focus when we are initializing default focus for a menu bar layer ( #787 )
7 years ago
3b85a8b6a0
Demo: Added an extra test related to baseline and fixed an id collision.
7 years ago
7c2926de17
Demo: Added an extra test related to baseline and fixed an id collision.
7 years ago
d394c7ad0b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
0106dcbd02
Fixed IsItemHovered() - part of the processing has to be done in ItemAdd() because the widget may alter clipping rectangle temporarily.
7 years ago
cc26db8ec7
Merge branch 'master' into navigation
7 years ago
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().
7 years ago
8fd4beddb8
Merge branch 'master' into navigation
7 years ago
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.
7 years ago
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.
7 years ago
7e8069dd23
Merge branch 'master' into navigation
7 years ago
a34edb810e
Demo: Fixed overlay demo keeps resizing (in case, e.g.: font changes)
7 years ago
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.
7 years ago
1ff27d7db8
Added io.WantMoveMouse flags from Nav branch so Examples/Binding can already implement it. ( #787 )
7 years ago
44e8d94aba
Merge branch 'master' into navigation
7 years ago
709653c330
Merge branch 'master' into styles
7 years ago
38ed66f55e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
9e2f202f05
Demo: Not using the undesirable Begin() overload.
7 years ago
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
6a1ba317c7
Demo: Minor coding style tweaks so bgfx copy needs less patching.
7 years ago
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
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.
7 years ago
40f608ce9b
Version 1.52 WIP
7 years ago
55a6209931
Version 1.51
7 years ago
82c3116b4f
Demo: Displaying version number in test window.
7 years ago
444792f75f
Merge fixes from ,master branch
7 years ago
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
54bdd00df7
Columns: Fix for explicit content width and scrollbar. ( #519 , #125 )
7 years ago
1ebd7ec049
Demo: Columns: Added Horizontal Scrolling demo. Tweaked another Columns demo. ( #519 , #125 , #913 )
7 years ago
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
7 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
7 years ago
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.)
7 years ago
bf0d9c123e
Merge branch 'master' into navigation
7 years ago
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
7 years ago
52f1a4124c
Demo: Tweaked Fonts section.
7 years ago
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
7 years ago
668a4bf1bc
Demo: style editor output tweak so it is easier to modify the output code.. + TODO list update
7 years ago
18b50f8eba
Comments
7 years ago
9bf5028fd3
Merge branch 'master' into navigation
7 years ago
97fccbdb73
Demo: Fixed conflicting id introduced in be9628494a . Added tooltip.
7 years ago
5eef7dd82f
Demo: Consoles: Added "Copy" button to demonstrate LogToClipboard
7 years ago
73f9c9d80c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
7e452ec737
Renamed ImGuiSetCond_XXX type and enums to ImGuiCond_XXX, kept old enums under #ifdef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
7 years ago
059e838b2c
Merge branch 'master' into navigation
7 years ago
be9628494a
Demo: Rearranged everything under Widgets in a more consistent way.
7 years ago
d888de4483
Demo: Merged a few demo tweaks from navigation branch to minimize drift.
7 years ago
30d1e5712a
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
942cb0e1f2
Added SetColorEditOptions(). ColorPicker4: context menu to select picker type and alpha bar. Reorganized flags (again!). ( #346 )
7 years ago
d952a8d3bf
Demo: Color widget demo tweaks ( #346 )
7 years ago
03700ad15e
Merge remote-tracking branch 'origin' into 2016-07-navigation
7 years ago
1c991b525a
Merge remote-tracking branch 'origin' into 2016-02-colorpicker
7 years ago
e36b41cbd0
Fixed Y scroll aiming when Horizontal Scrollbar is enabled ( #665 ). Tweak log demo.
7 years ago
233a6efeba
Fixed GetScrollMaxX(), GetScrollMaxY(). Tweak demo to display more data. Using functions in Begin(). ( #1271 )
7 years ago
cdea8ca94f
Demo: Comment about 'static' and some tweaks ( #1267 )
7 years ago
f6460970c5
ColorPicker: Hue wheel + SV triangle picker mode (mode selection flags still wip, missing context menu and persistent options). ( #346 )
7 years ago
3075d8bcd4
ColorEdit4: Preliminary support for ImGuiColorEditFlags_HDR flag (currently only lift limits). ( #346 )
7 years ago
91a4f5df25
Demo: Tweaks
7 years ago
90fcd4a829
Renamed ImGuiColorEditFlags_NoColorSquare to ImGuiColorEditFlags_NoSmallPreview ( #346 )
7 years ago
4d844ffde1
Demo: custom ColorPicker popup example tweaks ( #346 )
7 years ago
f040547a5f
Demo: custom ColorPicker popup example ( #346 )
7 years ago
fef8aac523
ColorPicker4: hue/alpha bars draw arrows that would look right on all background. RenderArrow helper. ( #346 )
7 years ago
35186a1165
Demo: Comments ( #346 )
7 years ago
3926bd08e1
ColorPicker: Added ImGuiColorEditFlags_NoSidePreview flag + optional reference color. Added more demo code. ( #346 )
7 years ago
6bc1572d31
ColorPicker: Comments. Single input value mode allow access to context-menu options. ( #346 )
7 years ago
973d4a361b
ColorPicker: Forward AlphaPreview flag to its individual inputs/sliders. Split code into extra lines to make logic more readable. ( #346 )
7 years ago
cdcda9ff68
ColorEdit4: Store edit options per window. Demo: Letting user change edit mode. ( #346 )
7 years ago
c36d59a42a
ColorEdit, ColorPicker: AlphaPreview, AlphaPreviewHalf are explicit. Updated demo and using in style editor. 3x3 checkerboard more readable in half mode. ( #346 )
7 years ago
b7a563276d
ColorTooltip: Honor ImGuiColorEditFlags_HalfAlphaPreview flag by calling ColorButton(). Added HalfAlphaPreview to demo. ( #346 )
7 years ago
2e37db9002
ColorEdit4: Fix not forwarding ImGuiColorEditFlags_AlphaBar flag to ColorPicker4 ( #346 )
7 years ago
6796e771fd
ColorEdit, ColorPicker: added ImGuiColorEditFlags_NoAlphaPreview flag ( #346 ). Reorder flags again.
7 years ago
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 )
7 years ago
7b2d79cffd
ColorEdit: Added ImGuiColorEditFlags_Float flag to display and edit drag values in 0.0..1.0 range instead of 0..255. ( #346 )
7 years ago
4def2ce339
ColorPicker: Demo tweaks ( #346 )
7 years ago
790d0eb5be
ColorPicker: Added ImGuiColorEditFlags_AlphaBar option ( #346 )
7 years ago
91bf8fd689
ColorPicker,ColorEdit: Demo code ( #346 )
7 years ago
c8553817d9
Merge branch 'master' into 2016-02-colorpicker
7 years ago
100d30a0a1
Comments about IMGUI_DISABLE_TEST_WINDOWS ( #1240 , #169 )
7 years ago
3e4cb40d45
Merge branch 'master' into 2016-02-colorpicker
7 years ago
8261d9ff30
Comments ( #1172 , #1231 )
7 years ago
12d265fa31
Version 1.51 WIP tag
7 years ago
5e1caaaef3
Version 1.50
7 years ago
8228dc20df
Merge branch 'master' into 2016-07-navigation
7 years ago
c038339a4c
Merge branch 'master' into 2015-02-colorpicker
7 years ago
026d021df1
Demo: Fixed warnings introduced in 0828a1fd6c
7 years ago
0828a1fd6c
Fixed computation of ImFont::MetricsTotalSurface not taking oversampling into account
8 years ago
497381dc3d
Comments
8 years ago
89b1497843
Merge branch 'master' into 2016-02-colorpicker
8 years ago
288dccd5a5
Merge branch 'master' into 2016-07-navigation
8 years ago
e10ceebd36
ImFont: Store the texture surface used to get an idea of how costly each font is.
8 years ago
b6c0227add
Merge branch 'master' into 2016-02-colorpicker
8 years ago
c76be71acf
Merge branch 'master' into 2016-07-navigation
8 years ago
714beb217c
Demo: Console: Fixed a completion bug when multiple candidates are equals and match until the end.
8 years ago
68df09cf47
Fixed word-wrapping which would never wrap after a 1 character word. (thanks @sronsse)
8 years ago
a60b2cc645
Merge branch 'master' into 2016-02-colorpicker
8 years ago
fdc70456f4
Merge branch 'master' into 2016-07-navigation
8 years ago
omar