2c13a74a9d
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
# imgui.cpp
4 years ago
db886f3953
Demo: Rework Clipping section. Fix for static analysis. Added bindings in Readme.
4 years ago
963839373c
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
4 years ago
de1588928b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
4 years ago
4929a8e4a5
InvisibleButton: Made public a small selection of ImGuiButtonFlags (previously in imgui_internal.h) and allowed to pass them to InvisibleButton().
4 years ago
f79f0e42f7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
4 years ago
550f110354
InputText, ImDrawList: Fixed assert triggering when drawing single line of text with more than ~16 KB characters. ( #3349 )
4 years ago
ddabfc3477
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
4 years ago
9418dcb693
Version 1.77
...
+ fix minor clang-tidy warnings which seems reasonable
4 years ago
20d61f5f62
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
4 years ago
99f68d7958
Docs: Added FAQ entries removed old one which is misleading today. Misc tweaks.
4 years ago
078571b7a9
Popups: added comments, reorganized the functions in imgui.h
4 years ago
99ab521024
Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point
4 years ago
582f4db59b
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
4 years ago
510f301c9f
Internals: Removed seemingly unnecessary size_on_first_use arg to CreateNewWindow(), extracted code into ApplyWindowSettings.
4 years ago
0e884304ee
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.h
5 years ago
ec2a24a5f1
Selectable: Allow using ImGuiSelectableFlags_SpanAllColumns in other columns than first. Comments. ( #125 )
5 years ago
7c11997bcc
Selectable: Fixed honoring style.SelectableTextAlign with unspecified size. ( #2347 , #2601 )
5 years ago
16a9488c13
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui_draw.cpp
5 years ago
75a65f6fb0
CI: Test build with large indices, obsolete functions disabled and demo/metrics windows disabled.
...
+ amend notes
5 years ago
ea0399414c
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
5 years ago
4a10af2bda
Unicode, Windows: Remove stringapiset.h include (breaks vs2010 and seems unnecessary?). ( #2541 , #2815 )
5 years ago
aef057e975
Internals: Added GetInputTextState() + comments.
5 years ago
05c3e0b898
Merge commit 'caca55c642d16cf1c2649831c5d06b1f26146d12' into docking
...
# Conflicts:
# examples/imgui_impl_sdl.cpp
# imgui.cpp
5 years ago
2679bee28d
Internals: Refactor: Moved code out of NewFrame() into UpdateTabFocus() and UpdateSettings()
5 years ago
0342a3c548
Menus: Implement BeginMenu() appending to existing menu when executed with same ID multiple times. ( #1207 )
5 years ago
898e91f20d
Internals: Added TempInputText() to facilitate creation of custom widgets, renamed TempInputTextScalar() to TempInputScalar() etc. ( #2718 )
...
+ Minor imgui.h/todo comments
5 years ago
8432d1bfc7
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
d37d25470a
Added IMGUI_DISABLE compile-time definition to make all headers and sources empty.
5 years ago
e7bfcb970e
Merge branch 'master' into docking
...
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_demo.cpp
# imgui_internal.h
5 years ago
6c1a73774d
Tooltip: Testing DragDropWithinSourceOrTarget in BeginTooltipEx() instead of just BeginTooltip() - feel this was an overlook. Added tooltip flags instead of using bool.
5 years ago
f5528001f6
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# imgui.cpp
# imgui_internal.h
5 years ago
4d4e3b97f4
TODO, Readme
...
(dropped TreeNode_NoIndent flag from todo, as it feels unnecessary)
5 years ago
861f786d81
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
5 years ago
0dd02dd90d
Happy new year!
...
Comments, Replaced pictures, Removed Patreon
5 years ago
992736dc5d
Merge branch 'refs/heads/master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# examples/imgui_impl_win32.cpp
# imgui.cpp
# imgui_internal.h
# imgui_widgets.cpp
5 years ago
6fdde67be2
Documentation, FAQ, todo tweaks
5 years ago
8342e5b91a
Amend previous commits (added ImGuiMouseCursor_NotAllowed enum + new cursors in GLFW 3.4)
...
Amend b5cad20d79945a509773
5 years ago
71a58261f6
Docking: Internals: Removed redundancy in code path leading to the BeginAsDockableDragDropSource(), clarified UpdateMouseMovingWindowEndFrame()
...
Note that the ConfigWindowsMoveFromTitleBarOnly path for UpdateMouseMovingWindowEndFrame() would previously test the window->RootWindow title bar instead of window->RootWindowDockStop. This didn't have any side effect afaik because we wouldn't enter that function anyway as clicking on any tab bar would trigger the move before UpdateMouseMovingWindowEndFrame() does it. However for consistency made the UpdateMouseMovingWindowEndFrame()code more correct.
+ minor renaming
5 years ago
813e0c18e6
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx12.cpp
# examples/imgui_impl_dx12.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_metal.h
# examples/imgui_impl_metal.mm
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# examples/imgui_impl_vulkan.cpp
# imgui.cpp
# imgui.h
# imgui_internal.h
5 years ago
9efaf2828b
Doc comments. Removed .ini parsing code from 1.53 that parsed entries without the [Window] tag (which enabled importing an old .ini file)
5 years ago
c3fd4ae473
Docking: comments
5 years ago
7feccf9ab2
Merge branch 'master' into docking
...
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx10.h
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_dx11.h
# examples/imgui_impl_dx9.cpp
# examples/imgui_impl_dx9.h
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_opengl2.cpp
# examples/imgui_impl_opengl2.h
# examples/imgui_impl_opengl3.cpp
# examples/imgui_impl_opengl3.h
# imgui.cpp
5 years ago
53278be61f
FAQ, Readme. Use = {} instead of = { 0 }, wasn't problematic because they were all static variables or one stack array not read. But hey.
5 years ago
e0c0e53edf
Merge branch 'master' into docking
...
# Conflicts:
# docs/CHANGELOG.txt
5 years ago
a2f3dcfc97
Added comment about SDL and SDL_INIT_GAMECONTROLLER. ( #2809 )
5 years ago
6994bf10bc
Merge branch 'master' into docking + fix for RenderMouseCursor()
...
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
# imgui_draw.cpp
# imgui_internal.h
5 years ago
25849234f6
Internal: Tree: tweaks (initially tried to implement auto-scrolling, stashed)
5 years ago
3233d85d2f
Merge branch 'master' into docking
5 years ago
a45e3b5bb3
Readme, Wiki: Image loading examples.
5 years ago
omar
Rokas Kupstys