f6ee8d30fb
Comments ( #1567 )
7 years ago
d500113f1d
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
7 years ago
9a76fd30fd
Added SetNextWindowBgAlpha() helper. ( #1567 ) particularly helpul with the marking of the old 5-parameters version of Begin() as obsolete.
7 years ago
2645ab5f7f
Comments + added legacy renamed GetItemsLineHeightWithSpacing() as stated in the doc, fixes 6190ab0084
7 years ago
13c407591e
Nav: Comments, tweaks
7 years ago
9076366c17
Style: Exposed ImGuiStyleVar_WindowTitleAlign, ImGuiStyleVar_ScrollbarSize, ImGuiStyleVar_ScrollbarRounding, ImGuiStyleVar_GrabRounding + added an assert to reduce accidental breakage. ( #1181 )
7 years ago
9edf211c0e
Merge branch 'master' into navigation
7 years ago
5e2aa6185c
Reorganized context handling to be more explicit,
...
- YOU NOW NEED TO CALL ImGui::CreateContext() AT THE BEGINNING OF YOUR APP, AND CALL ImGui::DestroyContext() AT THE END.
- removed Shutdown() function, as DestroyContext() serve this purpose.
- you may pass a ImFontAtlas* pointer to CreateContext() to share a font atlas between contexts. Otherwhise CreateContext() will create its own font atlas instance.
- removed allocator parameters from CreateContext(), they are now setup with SetAllocatorFunctions(), and shared by all contexts.
- removed the default global context and font atlas instance, which were confusing for users of DLL reloading and users of multiple contexts
(#1565 , #586 , #992 , #1007 , #1558 )
7 years ago
7e4d28a49d
Context: Renamed SetMemoryAllocators() to SetAllocatorFunctions(). Tweaked comments. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
5a301c29dc
Context: Removed allocator parameters from CreateContext(), they are now setup with SetMemoryAllocators() and shared by all contexts. ( #1565 , #586 , #992 , #1007 , #1558 )
7 years ago
5eb293c879
ImFontAtlas: Added TexUvScale (= 1.0f / (float)TexWidth, 1.0f / (float)TexHeight)
7 years ago
cd1409f4bf
ImFontAtlas: Moved mouse cursor data out of ImGuiContext, fix drawing them with multiple context. Also remove the last remaining undesirable dependency on GImGui in imgui_draw.cpp, finishing the work recently done with ImDrawListSharedData. Hurra! ( #939 )
7 years ago
0b1fecb792
Horizontal mouse wheel: renamed io.MouseHorizWheel to io.MouseWheelH. Reorganized the code in NewFrame(). Examples: Updated GLFW+GL and SDL+GL accordingly. ( #1463 )
7 years ago
6f6b6194b2
Merge branch 'tseeker/20171127-feature-horiz-wheel' of https://github.com/tseeker/imgui into tseeker-tseeker/20171127-feature-horiz-wheel
...
# Conflicts:
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
8877622fa8
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
c2ffce3e5a
Drag and Drop: Fix comment. Removed IMGUI_PAYLOAD_TYPE_DOCKABLE from master branch. ( #143 )
7 years ago
63d47e8328
Drag and Drop: Increased payload type string to 12 characters instead of 8.( #143 )
7 years ago
932d3f0198
NewFrame(): Added an assert to detect incorrect filling of the io.KeyMap[] array earlier. ( #1555 ) + comments.
7 years ago
d1f726cd9d
Comments about Begin/End pair and handling of return value.
7 years ago
472ba1394c
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
28a76af185
Internal: DrawData: Tidying, renaming.
7 years ago
c85d7d6e49
Nav: Remove GetItemID(), hide ActivateItem() before this feature is unfinished and has issue (full feature is on hold). Undo part of 59c6f35bf6 ( #787 )
7 years ago
cd7e178eac
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
398a4e1865
Made obsolete IsAnyWindowHovered()/IsAnyWindowFocused() static inline. static only tends to trigger warnings. ( #1382 )
7 years ago
a63fbbca8b
Added ImGuiHoveredFlags_AnyWindow, ImGuiFocusedFlags_AnyWindow. Obsoleted IsAnyWindowHovered()/IsAnyWindowFocused() in favor of IsWindowHovered(ImGuiHoveredFlags_AnyWindow)/IsWindowFocused(ImGuiFocusedFlags_AnyWindow). Added to demo. ( #1382 )
7 years ago
fe919995da
Merge branch 'master' into navigation
7 years ago
ce95b84825
Added ImGuiKey_Insert for future use. Setup in all example bindings. ( #1541 )
7 years ago
168200f915
Popups: Comments, reorganize bits of the header section, renamed parameters.
7 years ago
a8e5542d78
BeginPopup: Exposed extra_flags publicly. ( #1533 )
7 years ago
66b2ee6ea2
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
407955d9fb
Examples: Using IM_OFFSETOF macro. + Comments
7 years ago
2b8224692e
Merge branch 'master' into navigation
7 years ago
0a0b252bb6
DragDrop: Removed IsDragDropActive() (introduced a few days ago, revert 06bea369c0) as our use case doesn't need it anymore. Will add it if there is a real need.
7 years ago
9fbecac87e
Demo: Improved Selectable() examples. ( #1528 )
7 years ago
96ccc484f9
Merge branch 'master' into navigation
...
# Conflicts:
# imgui_internal.h
7 years ago
3c6fbe0849
Renamed ImGuiSizeConstraintCallback to ImGuiSizeCallback, ImGuiSizeConstraintCallbackData to ImGuiSizeCallbackData.
7 years ago
7a15fc8de5
Merge branch 'master' into navigation
7 years ago
fbf2435f38
Exposed IM_OFFSETOF() helper in imgui.h
7 years ago
eef9120e07
Reorganized comments in the IMGUI_DISABLE_OBSOLETE_FUNCTIONS function. Added an IM_ASSERT(0).
7 years ago
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
c4e6d622c1
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
# imgui.h
7 years ago
06bea369c0
DragDrop: Added IsDragDropActive() helper which is useful for binding to decide how to handle mouse inputs.
7 years ago
49eed6e2d1
Version 1.54 WIP
7 years ago
436cad4bca
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.h
7 years ago
d9034bf2d8
ListBox() changed signature of ListBox() to match Combo(). Still not very happy about not using const char** anymore. ( #931 )
7 years ago
149523a101
Fixing error: declaration of ‘size’ shadows a member of 'this' [-Werror=shadow]
7 years ago
e916310b2e
Version 1.53
7 years ago
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
omar
Branimir Karadžić
ibachar