3d48f5b8c2
Demo: BeginCombo() demo code
7 years ago
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
b1930c5672
Merge branch 'master' into navigation
7 years ago
e9ceef4762
ImVector: Revert 6172e93272 actually problematic with our current use (because we don't construct the instances).
7 years ago
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
a5739a0aa3
Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type ( #1184 )
7 years ago
69879dd4f3
ImVector: Spacing.
7 years ago
8e8b5498f7
ImVector: insert() uses grow_capacity() - had inconsistent resize policy
7 years ago
6172e93272
ImVector: Added assignments and = operators + comments.
7 years ago
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
14cb8177d0
ImDrawList: Removed 'bool anti_aliased = true' final parameter of ImDrawList::AddPolyline() and ImDrawList::AddConvexPolyFilled(). Anti-aliasing is controlled via the regular style.AntiAliased flags.
7 years ago
531c11d5c7
ImDrawList: Small refactor toward removing dependency on GImGui + PushClipRectFullscreen now correctly uses data provided by imgui which can takes account of DisplaySize + Removed static variable in PathArcToFast() which caused linking issues to some.
7 years ago
230f826ef5
ImDrawList: Comments
7 years ago
4c2514dc29
Merge branch 'master' into navigation
7 years ago
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
7 years ago
abaf347deb
Added a flag for text input to disable undo / redo
7 years ago
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
7 years ago
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
7 years ago
eefea0588a
Using the ImGuiWindowFlags_NoScrollWithMouse flag on a child window forwards the mouse wheel event to the parent window, unless either ImGuiWindowFlags_NoInputs or ImGuiWindowFlags_NoScrollbar are also set. ( #1380 , #1502 )
7 years ago
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
7 years ago
5f39758202
Minor tweaks, comments, spacing fixes
7 years ago
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
7 years ago
16fb58984f
Merge branch 'master' into navigation
7 years ago
90788a1242
ImVector: Added ImVector::contains() helper
7 years ago
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
7 years ago
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
7 years ago
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
7ec934f439
Drag and Drop: Comments
7 years ago
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
08b72eb5c0
IsWindowFocused() refactor will flags. ( #1382 )
...
Marked IsRootWindowFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootWindow).
Marked IsRootWindowOrAnyChildFocused() as obsolete in favor of using IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows).
7 years ago
fa179d0ad8
Reordered ImGuiHoveredFlags to match upcoming ImGuiFocusedFlags ( #1382 )
7 years ago
4a555d35f0
IsWindowHovered(): split ImGuiHoveredFlags_FlattenChild into separate ChildWindows and RootWindow flags. Allowing more combination and a better symetry with IsWindowFocused() flags. ( #1382 )
7 years ago
185c1eaaf3
Alignment + removed comments
7 years ago
f93945540f
Renamed ImGuiTreeNodeFlags_AllowOverlapMode to ImGuiTreeNodeFlags_AllowItemOverlap. ( #600 , #1330 )
7 years ago
6b168b43ff
Comments ( #822 )
7 years ago
2b9d8ab91d
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
38bfdb357e
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
f06f68f3ce
Obsoleted old functions: SetScrollPosHere (marked obsolete in 1.42, July 2015). GetWindowFont(), GetWindowFontSize() (marked obsolete in 1.48, March 2016)
7 years ago
9fd15defe4
Added an implementation of SetItemDefaultFocus() in the master branch for combo patterns to use and be more forward-compatible. ( #787 )
7 years ago
d1db229907
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_demo.cpp
7 years ago
1096e14356
ImFont: Added GetDebugName() helper.
7 years ago
e3e0326ea9
Exposed BeginCombo() publicly.
7 years ago
080f61858f
Sorted typedefs/enumations forward declarations in imgui.h
7 years ago
eab6333a0b
SetNextWindowContentSize() adjust for client->window size, but the fate of borders isn't really clear for now (until now we always tried to make borders not affect layout, so if we want a 200x200 fully visible space with borders and zero window padding user need to include the borders) ( #1490 )
7 years ago
0872020c5c
Comments
7 years ago
f72b002da8
Removed SetNextWindowContentWidth(), prefer using SetNextWindowContentSize(). Kept redirection function (will obsolete). ( #246 , #519 , #1444 )
7 years ago
871a5cecc1
Merge branch 'master' into navigation
7 years ago
c9f0275e22
Combo: Removed ImGuiWindowFlags_ComboBox flag. Moved internal window flags.
7 years ago
7bf85db6c4
Drag and drop: Added COL3F payload for color without alpha overwrite. Exposed standard color payload types in imgui.h ( #143 )
7 years ago
553b0fcf8f
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
97edd42fc0
Indent(), Unindent(): Allow passing negative values.
7 years ago
e6215b6ca0
Merge branch 'master' into navigation + merge fix
...
# Conflicts:
# imgui.cpp
7 years ago
94bf12f14b
Demo: Display better mouse cursor info for debugging backends.
7 years ago
20c7aab60c
Exposed GetOverlayDrawList(). (~#545, ~#530)
7 years ago
3b7e4eaf38
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
7 years ago
90ae1c59c4
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
7 years ago
729333293c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
0f119865a6
Comments about ImGuiWindowFlags_ResizeFromAnySide. Removed hovering color. May need its own color. ( #822 )
7 years ago
2ca4f9e862
Added ImGuiWindowFlags_ResizeFromAnySide flag and code to resize from any of the 4 corners (only 2 corners enabled). ( #822 )
7 years ago
63712d5f5c
Merge branch 'master' into drag_and_drop
7 years ago
9191b17218
Merge branch 'master' into navigation
7 years ago
4c4f1b0224
ImVector: Added ImVector::push_front helper.
7 years ago
77a310736d
Horizontal mouse wheel support
...
This patch adds support for the horizontal mouse wheel in ImGui. It
affects windows that can be scrolled, as long as the Ctrl key is not
being pressed.
The scrolling speed has been set empirically so that it matches the
scrolling speed on the Firefox browser when the horizontal wheel is
used.
Internally, it adds a MouseHorizWheel to ImGuiIO, which is then used in
NewFrame to scroll the current window.
The SDL/GL2, SDL/GL3, GLFW/GL2 and GLFW/GL3 examples has been modified
to use it.
7 years ago
532f564fd3
ImGuiTextBuffer: Renamed append() helper to appendf(), appendv() to appendfv(). Added reserve().
7 years ago
d9c5d72962
ImGuiStorage: Added BuildSortByKey() helper to rebuild storage from stratch.
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
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
omar
ibachar
Emmanuel Benoît
thedmd
Jason Wilkins