omar
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
omar
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
7 years ago
omar
eef9120e07
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
7 years ago
omar
2dd2ca0096
Removed CalcItemRectClosestPoint() which was weird and not really used by anyone except demo code. If you need it it's easy to replicate on your side.
...
Removed internal corresponding ImRect::GetClosestPoint() for now.
Essentially revert dcaafffe0e
.
7 years ago
omar
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
omar
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
7 years ago
omar
49eed6e2d1
Version 1.54 WIP
7 years ago
omar
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
omar
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
7 years ago
Branimir Karadžić
149523a101
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
7 years ago
omar
e916310b2e
Version 1.53
7 years ago
omar
3d48f5b8c2
Demo: BeginCombo() demo code
7 years ago
omar
de5c304b49
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
1b86e7343f
Renamed the emblematic ShowTestWindow() function to ShowDemoWindow(). Kept redirection function (will obsolete).
7 years ago
omar
b1930c5672
Merge branch 'master' into navigation
7 years ago
omar
e9ceef4762
ImVector: Revert 6172e93272
actually problematic with our current use (because we don't construct the instances).
7 years ago
omar
ffb4f6ca8c
Merge branch 'master' into navigation
7 years ago
omar
a5739a0aa3
Fixed warning with Clang+MSVC using __int64 to define the helper ImU64 type ( #1184 )
7 years ago
omar
69879dd4f3
ImVector: Spacing.
7 years ago
omar
8e8b5498f7
ImVector: insert() uses grow_capacity() - had inconsistent resize policy
7 years ago
omar
6172e93272
ImVector: Added assignments and = operators + comments.
7 years ago
omar
1f26652944
Various zealous warning fixes (thanks Clang).
7 years ago
omar
287380261c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
omar
996dfb21cf
ImDrawList: Added ImDrawListFlags for AA settings. ImDrawList doesn't directly depends on GImGui anymore.
7 years ago
omar
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
omar
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
omar
230f826ef5
ImDrawList: Comments
7 years ago
omar
4c2514dc29
Merge branch 'master' into navigation
7 years ago
omar
55c0d2b9ab
InputText: renamed ImGuiInputTextFlags_DisableUndo to ImGuiInputTextFlags_NoUndoRedo ( #1506 , #1508 )
7 years ago
ibachar
abaf347deb
Added a flag for text input to disable undo / redo
7 years ago
omar
6497f5dc1b
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
omar
0c6e260f73
Drag and Drop: Added ImGuiDragDropFlags_SourceExtern to facilitate interfacing with WM_DROPFILES ( #143 )
7 years ago
omar
51433e26af
Drag and Drop: Renamed to ImGuiDragDropFlags_SourceNoAutoTooltip to ImGuiDragDropFlags_SourceNoPreviewTooltip ( #143 )
7 years ago
omar
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
omar
45bca7851d
Added ImGuiHoveredFlags_RootAndChildWindows helper for consistency with focused flags. ( #1382 )
7 years ago
omar
5f39758202
Minor tweaks, comments, spacing fixes
7 years ago
omar
cc3192f347
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
omar
3905816082
Added ShowFontSelector(), ShowStyleSelector(). ( #707 )
7 years ago
omar
16fb58984f
Merge branch 'master' into navigation
7 years ago
omar
90788a1242
ImVector: Added ImVector::contains() helper
7 years ago
omar
7c7a7baf76
Merged miscellaneous small stuff (from nav/dock branches).
7 years ago
omar
b174fcc9af
Added IsAnyWindowFocused() (from Nav branch).
7 years ago
omar
fa9327ccf8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_draw.cpp
# imgui_internal.h
7 years ago
omar
e98df91dc4
Drag and Drop: Added ImGuiCol_DragDropTarget ( #143 , #707 )
7 years ago
omar
7ec934f439
Drag and Drop: Comments
7 years ago
omar
052b6021dd
Merge branch 'master' into drag_and_drop
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
7 years ago
omar
0a3db267c3
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
7 years ago
omar
6190ab0084
Renamed GetItemsLineHeightWithSpacing() to GetFrameHeightWithSpacing()
7 years ago
omar
c22657985a
Added GetFrameHeight() function (used to be SmallSquareSize internally)
7 years ago
omar
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