31683cfe34
ImDrawList::AddImageRounded: removed PrimDistributeUV declaration, fixed coding style, restored argument order from original PR. ( #845 )
7 years ago
ba095f81a5
Merge branch '2016-08-rounded-image' of https://github.com/thedmd/imgui into thedmd-2016-08-rounded-image
7 years ago
8c0f2e4946
Added comment to help people dealing with 58345b11e1 breakage ( #707 )
7 years ago
79f07f6ff0
Add AddImageRounded() to ImDrawList
7 years ago
92212b17aa
Merge branch 'master' into drag_and_drop
7 years ago
9848a7023b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
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
c433bc971f
Reorder fields for consistency.
7 years ago
39137ccc3e
Style: renamed ImGuiCol_ChildWindowBg to ImGuiCol_ChildBg. ( #707 )
7 years ago
9886b09a0a
Minor tweak, removed extraneous empty destructor.
7 years ago
e605f21797
TreePush with zero arguments was ambiguous. Resolved by making it call TreePush(const void*)
7 years ago
9a44d447cd
NewFrame() now asserts if neither Render or EndFrame have been called. Exposed EndFrame(). Made it legal to call EndFrame() more than one. ( #1423 etc.)
7 years ago
d211a0e338
Merge branch 'master' into navigation (with style breakable)
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
7 years ago
4022ada843
Merge branch 'master' into drag_and_drop
7 years ago
4daf377c9b
Added comment about TextUnformatted(). ( #1450 )
7 years ago
d7af1a218e
Style: Added PopupRounding setting. ( #1112 )
7 years ago
0a61b7195c
Style: Added a default StyleColorsLight(). ( #707 )
7 years ago
58345b11e1
Style: Removed ImGuiCol_ComboBg in favor of combo boxes using ImGuiCol_PopupBg for consistency. ( #707 )
7 years ago
bd4bc929ce
Style: renamed style.ChildWindowRounding to style.ChildRounding, ImGuiStyleVar_ChildWindowRounding to ImGuiStyleVar_ChildRounding.
7 years ago
7746dd104c
Merge branch 'master' into drag_and_drop
7 years ago
6817f3a3d9
Merge branch 'master' into navigation
7 years ago
f5bdf443c9
Minor comments, tweaks
7 years ago
ae060b1d67
Merge branch 'master' into drag_and_drop
7 years ago
ffad688fc8
Drag and Drop: Added payload->IsPreview() to user can render their custom preview while handling overlapping drop targets. ( #143 )
7 years ago
2275cb8b83
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
30bf40195b
io.OptNoCursorBlink -> io.OptCursorBlink ( #1427 )
7 years ago
669498ff26
Added io.OptNoCursorBlink option to disable cursor blinking. ( #1427 ). Renamed io.OSXBehaviors to io.OptMacOSXBehaviors. Should affect users as the compile-time default is usually enough. ( #473 , #650 )
7 years ago
0d4c320f88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
7 years ago
de1e7dc088
Drag and Drop: Moved internal fields out of public sight. ( #143 )
7 years ago
8b725c94cb
Drag and Drop: Rework internal to allow overlapping targets ( #143 )
7 years ago
3461a2f296
Merge branch 'master' into drag_and_drop
7 years ago
ff4d4ca651
IsWindowHovered(): Added ImGuiHoveredFlags_FlattenChilds flag. Made IsRootWindowOrAnyChildHovered() obsolete in favor of IsWindowHovered( ImGuiHoveredFlags_FlattenChilds) ( #1382 , #1404 )
7 years ago
6fb43f2011
Update imgui.h
7 years ago
66f42324ad
Drag and Drop: Added ImGuiDragDropFlags_SourceNoHoldToOpenOthers flag.
7 years ago
63f6f2dd13
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
fba704bf5d
Examples: Added a bunch of comments/referencs related to io.WantCaptureMouse, io.WantCaptureKeyboard ( #1262 , #1237 , #1219 , #635 , #1058 , #1051 , #912 , #533 , #703 , #446 , #459 , #364 , #213 , #52 , and more)
7 years ago
59323b54da
Demo: Comments ( #1408 )
7 years ago
7f06d385a1
Added assertions and comments for incorrect use/understanding of IsWindowFocused() etc. functions
7 years ago
0e775807b4
Drag and Drop: Added a mechanism to allow widgets with no identifiers (such as Text/Image) to be used with BeginDragDropSource() given the explicit ImGuiDragDropFlags_SourceAllowNullID flag.
7 years ago
acf78da742
Drag and drop: moved to imgui.h
7 years ago
cb38caeda4
Examples: Added more comments near the fonts loading section, to catch common questions and errors (e.g. #1397 , #1366 , #1341 , #1222 , #1193 , #1115 , #951 , etc.)
7 years ago
edafbcd630
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
c503a50cff
Styles: Moved Classic colors code to imgui_draw.cpp. Sneakily added a StyleColorsDark() function.
7 years ago
77df1ba9e0
Version 1.53 WIP
7 years ago
b422f35872
IO: Tracking extra mouse dragging data which is convenient for implementating various manual drag and drop patterns.
7 years ago
c0b366b316
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
9f200d10d5
Version 1.52
7 years ago
5afee1c6f3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
8dd7648db2
Comments
7 years ago
3656f2c769
NewFrame: Allow MovedWindow setting the ImGuiWindowFlags_NoInputs after moving has started in order to be able to detect windows below it, which is useful for e.g. docking mechanisms.
7 years ago
f10a1d7b9e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
a6ff14d66e
Exposed IM_ARRAYSIZE() in imgui.h
7 years ago
f6ff373b22
Nav: #define IMGUI_HAS_NAV to ease sharing code across branches of imgui
7 years ago
6f0aa766e1
Nav: Added internal ImGuiNavReadMode_Released test for key releases.
7 years ago
d769e2515a
Merge branch 'master' into navigation
7 years ago
7f880674e5
Font: Renamed ImFont::Clear() to ImFont::ClearOutputData() for consistency with what ImFontAtlas does. DisplayOffset is set by constructor but not reset by ClearOutputData. ( #1349 )
7 years ago
5fa81f2a26
Nav: Added ImGuiNavInput_KeyMenu aside from ImGuiNavInput_PadMenu as it is one differenciator between pad and keyboard that's very annoying with the keyboard.
...
Remove the move/resize behavior that appears than holding the button for a while. (#787 )
7 years ago
e4bb9102f9
Merge branch 'master' into navigation
7 years ago
43df7eb5ea
Added OpenPopupOnItemClick(); helper which mimic BeginPopupContextItem() but doesn't do the open.
...
Made the color popups uses this standard function so they handle reopening a context menu.
7 years ago
1172ff62e1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
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
d29a6a5a5a
Moved IMGUI_DISABLE_OBSOLETE_FUNCTIONS block lower in the imgui.h file so obsolete functions can use flags. Also sane to quarantine them outside of the respectable area.
7 years ago
e384078d7a
IO: reordering some supposedly private fields.
7 years ago
d96b6ecf88
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
03b76bf05b
Begin: Marked 5 parameters version of Begin() as obsolete. Now waiting for a riot to happen!
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
d761825cfb
Nav: Renaming a field + Comments.
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
4d83078885
Nav: Moving code next to its peers
7 years ago
6e1199c603
Merge branch 'master' into navigation
7 years ago
335c8dd159
Comments (clarifying whether types are to be considered as flags or regular, non combinable enums)
7 years ago
59c6f35bf6
Added ActivateItem(), GetItemID() functions.
7 years ago
a3d0755181
Merge branch 'master' into navigation
7 years ago
a8788e51a7
SetKeyboardFocusHere() added assert to prevent passing values smaller than -1 as we may have to outlaw them (I think nobody was using that)
7 years ago
3ddcdcf6e7
Merge branch 'master' into navigation
7 years ago
67ac7da30f
Styles: Added ImGuiStyle::ScaleAllSizes(float) helper to make it easier to have application transition to e.g. High DPI with a matching style.
7 years ago
ca4db8c905
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
f99348711b
Added VerticalSeparator() entry point in imgui_internal. Seperator() in an horizontal layout context still does that.
7 years ago
a2b2e56e8e
Merge branch 'master' into navigation
7 years ago
09f6f564d9
ImFontAtlas: Fixed calling Clear() and rebuilding (broken in 3fe2ecfd4c) thanks @pdoane @mikesart
7 years ago
8fd4beddb8
Merge branch 'master' into navigation
7 years ago
3fe2ecfd4c
ImFontAtlas: Added support for CustomRect API to submit custom rectangles to be packed into the atlas / and map them as font glyphs
7 years ago
501e73feed
Minor comments
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
2170b0b278
ImFontAtlas: Comments and minor reorganization of declaration in header file.
7 years ago
529ca279a4
ImFont: Split some building code into a AddGlyph() helper (that custom rect code and imgui_freetype can use)
7 years ago
f1a20ec66d
Merge branch 'master' into navigation
7 years ago
728deff56c
Comments, debug code (commented), todo list
7 years ago
99b9f1c93c
Fix static misusage error with decent compilers. Error introduced in 4b82759598
7 years ago
7e8069dd23
Merge branch 'master' into navigation
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
92e55a8a79
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
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
62d7fa4324
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
f63c03c464
Internals: moved ButtonRepeat and AllowKeyboardFocus bools/stacks to a generic ItemFlags stack. Merged from Navigation branch.
7 years ago
5c4fda0fbc
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_internal.h
7 years ago
804ee78731
Added IsWindowAppearing().
7 years ago
fd684ba974
Removed 2 obsolete redirection functions (obsoleted 26+ months ago).
7 years ago
a9e1d9aab9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
358e7a194e
Added GetKeyPressedAmount() (from Nav branch) to be able to measure fast repeat rate accurately. Added internal CalcTypematicPressedRepeatAmount() function.
7 years ago
ee42fae468
Merge various minor things (supposedly harmless) from Navigation branch into Master to reduce differences. ( #787 )
7 years ago
807322c9a5
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
5938f1ba61
Added IsMousePosValid() helper.
7 years ago
f72ca6d22c
ImFontConfig: Added RasterizerMultiply option to alter the brightness of individual fonts at rasterization time, which may help increasing readability for some. Added RasterizerFlags for custom rasterizer flags (aka imgui_freetype)
7 years ago
304de0ee1b
ImFontConfig: Comments, const.
7 years ago
92a6faca6f
IO: io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we'll now accept negative mouse coordinates.
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
6ed75d3046
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
eb2bbf6f29
Renamed IsItemHoveredRect() to IsItemRectHovered(). Renamed IsMouseHoveringWindow() to IsWindowRectHovered() - follow up to previous commit 6be7d4904e merged from Nav.
7 years ago
52b39af0a0
Style: Added obsolete redirects for ImGuiCol_Columns*** fields. (ref 648f75b245)
7 years ago
6be7d4904e
Merge part of 88c1966629 from Nav branch. Renamed IsMouseHoveringAnyWindow() -> IsAnyWindowHovered(), IsMouseHoveringWindow() -> IsWindowHoveredRect() for consistency. Kept inline rediection function.
7 years ago
2e35957a81
Undo reordering of ImGuiKey in Nav branch
7 years ago
50b3a14d0a
Merge 2545d75c3b from Nav - Tidying up, removed two unnecessary window flags from being exposed in imgui.h
7 years ago
53e73182ff
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
8 years ago
9b484d24cd
ImDrawList: Added GetClipRectMin(), GetClipRectMax() helpers. Comments.
8 years ago
a511b00226
Columns: Fixed offset rounding leading to SetColumnOffset() being destructive when ImGuiColumnsFlags_NoPreserveWidths flag is not set. ( #913 , #125 )
8 years ago
19a42cb2fd
Columns: Moved BeginColumns/EndColumns/flags from #913 to imgui_internals.h + minor shallow tweaks. Removed demo code temporarily. ( #125 )
8 years ago
bc78535bbf
Merge branch 'master' of https://github.com/ggtucker/imgui into ggtucker-master
...
# Conflicts:
# imgui.cpp
# imgui.h
8 years ago
b4eeb4aa8d
Renamed GetStyleColName() to GetStyleColorName() for consistency. Extra comments in Api Breaking Changes section.
8 years ago
af2db53780
Added GetStyleColorVec4()
8 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.)
8 years ago
bf0d9c123e
Merge branch 'master' into navigation
8 years ago
d970957e2d
ImFontAtlas: Draft of an api to submit custom rectangle (not exposed). Atlas default texture chunk using it. (WIP: we are still storing mouse UV outside in GImGui)
8 years ago
24a78767d2
Merge branch 'master' into styles
...
# Conflicts:
# TODO.txt
8 years ago
c569676a7b
ImVector: Added a const
8 years ago
fd9460a087
added missing IMGUI_API to ImGuiTextFilter methods implemented in imgui.cpp
8 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
8 years ago
a85a14370b
OpenPopupEx() internal tweaks to receive an ImGuiID, BeginPopupContextXXX shortening unnecessarily long identifier.
8 years ago
5ea1865fdb
(api breaking) changed parameter order for BeginPopupContextWindow(), note that most uses relied on default parameters completely.
8 years ago
638d77c682
Comments ( #402 )
8 years ago
f98376d02b
Merge branch 'is-popup-open' of https://github.com/mkeeter/imgui into mkeeter-is-popup-open
...
# Conflicts:
# imgui.cpp
8 years ago
9239e91dc9
Whitespace fix to previous
8 years ago
718f00d651
Make font atlas packing padding configurable
8 years ago
18f217e631
Style: Moved position of ImGuiCol_TitleBgCollapsed
8 years ago
f8f382221c
ImVector: added resize() variant with initialization value
8 years ago
9bf5028fd3
Merge branch 'master' into navigation
8 years ago
d258287c92
Revert d2c219d #826 + tidying up ImFont::RenderChar()
8 years ago
d2c219df84
Merge pull request #826 from swetland/patch
...
ImFont: add RenderGlyph() to allow rendering of individual glyphs post-query
8 years ago
c26b29b254
Style: Moving code in a function to make incoming diff easier to parse.
8 years ago
648f75b245
Style: renamed ImGuiCol_Columns_*** to ImGuiCol_Separator_*** (BREAKING), Separator() uses this color as well. ( #707 , #1019 )
8 years ago
8c61a4eb4c
Fonts: Adding references to the fact that .OTF fonts are supported (but haven't renamed the entry points)
8 years ago
e3fae56089
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
8 years ago
d7cad903aa
Documentation tweaks
8 years ago
omar
thedmd
Jason Wilkins
Giuseppe Barbieri
Viktor Kirilov
James Wallis
omar