c4a158656e
Merge branch 'master' into viewport
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx12_example/main.cpp
# examples/directx9_example/main.cpp
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_glfw.h
# examples/imgui_impl_vulkan.cpp
# examples/opengl2_example/imgui_impl_glfw_gl2.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
# imgui.cpp
# imgui.h
7 years ago
69e700f869
Renamed ImGuiStyleVar_Count_ to ImGuiStyleVar_COUNT for consistency with other enums. Added
7 years ago
8a4093f38b
Added ArrowButton(). Exposed ImGuiDir.
7 years ago
1549c5cf5e
BeginCombo(): Added ImGuiComboFlags_NoArrowButton and ImGuiComboFlags_NoPreview flags + hover color matches drag and sliders.
7 years ago
e9fa17e1bf
Viewport: Replaced UpdatePlatformWindows/RenderPlatformWindows by RenderAdditionalViewports(). The update is always called in EndFrame(). ( #1542 )
7 years ago
df8a9c49eb
Allow user to override ImTextureId. ( #1641 )
7 years ago
6797ee4b68
Nav: Added links to PNG/PSD files for PS4 and Switch. Fixed suggested Joy-con mapping as per typical Nintendo-style mapping. ( #787 )
7 years ago
b3594a6407
Added ImGuiConfigFlags_IsSRGB, ImGuiConfigFlags_IsTouchScreen (strictly for user storage)
7 years ago
d98a5d54aa
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
2c9f45bbe7
Renamed ImGuiNavFlags io.NavFlags to ImGuiConfigFlags io.ConfigFlags. ( #787 )
7 years ago
735267d27c
Viewport: Initial viewport branch+ platform api commit (squashed from previous commits, still very WIP) ( #1542 )
7 years ago
b32bb4e6e3
Removed DisplayVisibleMin/DisplayVisibleMax facility (as part of # 1542). Misc comments.
7 years ago
3f335b0d42
Merge branch 'master' into examples_refactor
...
# Conflicts:
# examples/opengl3_example/imgui_impl_glfw_gl3.cpp
# examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
7 years ago
27667fc035
TreeNode: Renamed Beta ImGuiTreeNodeFlags_NavCloseFromChild to ImGuiTreeNodeFlags_NavLeftJumpsBackHere. ( #1079 )
7 years ago
e6bc840f6f
Merge branch 'master' into examples_refactor
7 years ago
79969931e6
ImDrawList: PushTextureID(): Removed unnecessary param by reference.
7 years ago
91cadc1130
Merge branch 'master' into examples_refactor
7 years ago
2c3c5125b3
Drag and Drop: BeginDragDropSource(): temporarily removed the optional mouse_button=0 parameter because it is really usable in typical conditions at the moment. ( #143 , #1637 )
7 years ago
45cbebad64
Added dummy io.DisplayPos field.
7 years ago
8d0723c2c3
ImFontAtlas: Added IsBuilt() helper.
7 years ago
1399c9c8a9
Merged a bunch of small inconsequential things from my work branch, to reduce the diff noise.
7 years ago
7c75835200
Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. ( #1626 )
7 years ago
63332d152a
Obsoleted the io.RenderDrawListsFn callback, you can call your graphics engine render function after ImGui::Render(). Use ImGui::GetDrawData() to retrieve the ImDrawData* to display..( #1599 )
...
Examples: Updated examples.
7 years ago
30c469f7c5
ImFont: DisplayOffset.y defaults to 0 instead of +1.
7 years ago
024e23c4d7
Comments, moved ImFontAtlas::Flags to "public" area.
7 years ago
fed0a884f7
ImFontAtlas: Added ImFontAtlasFlags_NoPowerOfTwoHeight, ImFontAtlasFlags_NoMouseCursors flags. ( #1613 )
7 years ago
9263bd68db
Fixed legacy forward function IsRootWindowOrAnyChildHovered() broken by a63fbbca8b
7 years ago
7cc1bc7635
Added IsAnyMouseDown() helper.
...
Examples: DirectX9/10/11: Using IsAnyMouseDown() instead of local function.
7 years ago
88dcbeb7ff
Styles: Comments and re-ordered.
7 years ago
8099f8c270
Comments
7 years ago
7c16d52f72
Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch ( #1565 , #787 )
7 years ago
f0364aa359
Merge branch 'context'
...
# Conflicts:
# examples/allegro5_example/main.cpp
# examples/directx10_example/main.cpp
# examples/directx11_example/main.cpp
# examples/directx9_example/main.cpp
# examples/marmalade_example/main.cpp
# examples/opengl2_example/main.cpp
# examples/opengl3_example/main.cpp
# examples/sdl_opengl2_example/main.cpp
# examples/sdl_opengl3_example/main.cpp
# examples/vulkan_example/main.cpp
7 years ago
4e5b7612ae
Nav: Documentation tweaks. ( #787 )
7 years ago
3171f90a1a
Nav: Keyboard is now automatically mapped based on io.KeyDown[]. ( #787 )
7 years ago
9e3a807813
Removed comments
7 years ago
057807f4a7
Added ImGuiKey_Space, mapped in every examples. Will be required for navigation. ( #787 )
7 years ago
7e32fc7109
Nav: Toward automatically mapping keyboard input. Renamed ImGuiNavInput_PadXXX to ImGuiNavInput_XXX. Renamed ImGuiNavInput_KeyXXX to ImGuiNavInput_KeyXXX_ (internal). ( #787 )
7 years ago
ed4bbc4fd4
Nav: Comments, guides.
7 years ago
cea8017e0b
Merge branch 'master' into context
7 years ago
3b7bd4563a
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
7 years ago
ad09396672
ImVec2: added [] operator. This is becoming desirable for some types of code, better added sooner than later.
7 years ago
92ee6b1185
Nav: Sets io.WantCaptureKeyboard when navigation is active. This is a little agressive but probably the best default and also a good way to get feedback. Added ImGuiNavFlags_NoCaptureKeyboard to disable this behavior. Comments. ( #787 )
7 years ago
5c83b55d04
Nav: Added ImGuiWindowFlags_NoNav shortcut, comments. ( #787 )
7 years ago
8ad88f725c
Nav: Minor tidying up. ( #787 )
7 years ago
0bd15b52a6
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
147ec8d1e2
Style Added style.MouseCursorScale, may remove ( #939 ).
7 years ago
ce9d7baaba
Nav: TreeNode: Added ImGuiTreeNodeFlags_NavCloseFromChild flag, allow closing a TreeNode() from any of child. The explicit flag is not great, perhaps allowing some form of inheritance would help. ( #787 , #1079 )
7 years ago
27980d9688
Merge branch 'master' into context
7 years ago
23c11e9764
Merge branch 'master' into navigation
...
# Conflicts:
# imgui.cpp
7 years ago
dd41a1650a
Comments
7 years ago
bd579e5429
Nav: Removed io.NavUsable --> io.NavActive, io.NavActive --> io.NavVisible. ( #787 ). NavActive takes account of NavFlags enable flags.
7 years ago
c851b33352
Nav: Added proper version of ImGuiWindowFlags_NavFlattened that handles scrolling nicely. Marked as private as I'm not happy with the name. ( #787 )
7 years ago
2933e6765c
Merge branch 'master' into navigation
7 years ago
94090eb08f
Added IMGUI_USER_CONFIG to define a custom configuration filename. ( #255 , #1573 , #1144 , #41 )
7 years ago
578016d08b
ImVector comment ( #1577 )
7 years ago
f2d5300408
Nav: Keyboard: Added CTRL+TAB (and CTRL+Shift+TAB) style window selection. ( #787 )
7 years ago
e9070e768e
Nav: Fixed renaming of c09016b12a that were incorrect. ImGuiNavInput_PadLeft -> PadDpadLeft, _PadScrollLeft -> PadLStickLeft. ( #787 )
7 years ago
5f7f27c8de
Nav: Comments. ( #787 )
7 years ago
f3776055d6
Merge branch 'master' into context
7 years ago
455989b8b1
Nav: Added io.NavFlags to hold various options. Added ImGuiNavFlags_EnableGamepad and ImGuiNavFlags_EnableKeyboard for bindings to use ( #787 )
7 years ago
c09016b12a
Nav: Renamed ImGuiNavInput_PadLeft / etc. to ImGuiNavInput_PadLStickLeft. Renamed ImGuiNavInput_PadScrollLeft to ImGuiNavInput_PadRStickLeft, aka removing trying-too-hard semantic from the enums. ( #787 )
7 years ago
bd278e958e
Nav: Added ImGuiNavInput_KeyLeft/Right/Up/Down set so we can differenciate gamepad/keyboard inputs. ( #787 )
7 years ago
680162eb32
Merge branch 'master' into navigation
7 years ago
823e1f0b94
Nav: Reordered NavInput enums to match directional order of ImGuiDir_ and ImGuiKey_ + comments ( #787 )
7 years ago
eb7ec781dc
Nav: Tweak GetNavInputAmount(). Split debug defines.
7 years ago
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
omar
Branimir Karadžić
ibachar