ocornut
|
e9053515bb
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/example_glfw_vulkan/main.cpp
# examples/example_sdl_vulkan/main.cpp
|
4 years ago |
|
omar
|
d451f6cc30
|
Nav tweaks. Demo: Fixed drag and drop demo state (broken by f152fac4f1). Fixed incorrect format string (which would work without IMGUI_DISABLE_OBSOLETE_FUNCTIONS).
|
4 years ago |
|
ocornut
|
9d20a5f0a5
|
Docking: DockSpace() emits ItemSize() properly + dockspace demo (works now since 05a25e5f3)
|
4 years ago |
|
ocornut
|
ad8fdc917f
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
4 years ago |
|
ocornut
|
9262609eaf
|
Version 1.79 WIP
|
4 years ago |
|
ocornut
|
fc9ccad6b9
|
InputText: Add ImGuiInputTextFlags_CallbackEdit, selection helpers in ImGuiInputTextCallbackData(). Add simple InputText() callbacks demo.
|
4 years ago |
|
ocornut
|
05bc204dbd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.h
|
4 years ago |
|
ocornut
|
95c99aaa4b
|
Version 1.78
|
4 years ago |
|
ocornut
|
c6b01e8e1d
|
Drag, Sliders: Merged ImGuiDragFlags back into ImGuiSliderFlags. (#3361, #1823, #1316, #642, #1829, #3209)
Technically API breaking (but ImGuiDragFlags were pushed on master 16 hours ago)
|
4 years ago |
|
ocornut
|
25a9209b75
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
4 years ago |
|
omar
|
f32663b33c
|
Drags, Sliders: Removed locking behavior with min > max (added in 1.73)
|
4 years ago |
Ben Carter
|
fa279a6aa0
|
Drags, Sliders: Added deadzone to make selecting 0.0 on linear sliders easier, slider navigation delta accumulation. (#3361, #1823, #1316, #642)
|
4 years ago |
|
omar
|
f75b29e7be
|
Drags, Sliders: Added ImGuiDragFlags_NoInput/ImGuiSliderFlags_NoInput to disable turning widget into a text input with CTRL+Click or Nav Enter.
|
4 years ago |
|
omar
|
8018623c5b
|
Drags, Sliders: Added ImGuiDragFlags_NoRoundToFormat / ImGuiSliderFlags_NoRoundToFormat flags (#642)
|
4 years ago |
|
omar
|
170d02bd99
|
Drags, Sliders: Added ImGuiDragFlags_ClampOnInput/ImGuiSliderFlags_ClampOnInput flags to force clamping value when using CTRL+Click to type in a value manually. (#1829, #3209)
|
4 years ago |
|
omar
|
43c099f31e
|
Drags, Sliders: Logarithmic: Moved flags to internals, allowing 1.0f to pass by. (#3361, #1823, #1316, #642)
|
4 years ago |
|
omar
|
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 |
|
omar
|
fc61018b1c
|
Demo: Renamed "Layout" -> "Layout & Scrolling". Fixed usage of local struct as template class (c++11).
|
4 years ago |
|
omar
|
473a01adb0
|
Scrolling: Avoid SetScroll, SetScrollFromPos functions from snapping on the edge of scroll limits. (#3379) + Demo: Rename "Layout" to "Layout & Scrolling".
|
4 years ago |
|
omar
|
db886f3953
|
Demo: Rework Clipping section. Fix for static analysis. Added bindings in Readme.
|
4 years ago |
|
omar
|
963839373c
|
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
|
5 years ago |
|
omar
|
de1588928b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
5 years ago |
|
omar
|
55041ac3be
|
Demo: Removed thin triangle and aligned code.
|
5 years ago |
|
omar
|
912c45ab23
|
Demo: Improve "Custom Rendering"->"Canvas" demo with a grid, scrolling and context menu.
|
5 years ago |
|
omar
|
70fa37527d
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
|
5 years ago |
|
omar
|
218ff3a2a5
|
Internals: Backport one ->WasActive test in NavRestoreLastChildNavWindow() from 9bf6509c6 + minor/shallow bits from docking branch.
|
5 years ago |
|
omar
|
b8c22bdb28
|
DragFloatRange2, DragIntRange2: Fixed an issue allowing to drag out of bounds when both min and max value are on the same value. (#1441)
|
5 years ago |
|
omar
|
4be8155002
|
Style Editor: Added preview of circle auto-tessellation when editing the corresponding value..
|
5 years ago |
|
omar
|
825f2ae455
|
Demo: Tweak "child windows" section. (#3318)
|
5 years ago |
|
omar
|
f79f0e42f7
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
|
5 years ago |
|
omar
|
3a6c9907cd
|
Texture-based thick lines: Minor tweaks and rename toward merging in master. Changes to allow changing AA_SIZE (disable texture path).
|
5 years ago |
|
omar
|
78d6bdf080
|
Texture-based thick lines: Remove unnecessary indirection in fetching UV data, removed lerp call, renames, tweaks.
|
5 years ago |
|
Omar
|
a07c8b6999
|
Texture-based thick lines: Fixes for AddCustomRect api, add IMGUI_HAS_TEXLINES define (temporarily) to facilitate working with test cases, Demo allows growing FrameBorderSize for testing
|
5 years ago |
|
omar
|
222b7ddbfa
|
Texture-based thick lines: Tweaks, fix for truetype builder.
|
5 years ago |
|
Ben Carter
|
741ab74b55
|
Texture-based thick lines: Improvements to code for drawing anti-aliased lines using textures
Moved line width into a constant
Removed test code (now in imgui-tests)
Improved matching between geometry and texture rendering at non-integer sizes
|
5 years ago |
|
Ben Carter
|
1d3c3070d8
|
Texture-based thick lines: Initial version of AA line drawing using textures (press SHIFT to enable)
|
5 years ago |
|
Ben Carter
|
8e4046e13b
|
Atlas build use GetCustomRectByIndex() + comments, rename, and shallow merge from tex_antialiasing_lines branch.
|
5 years ago |
|
omar
|
a1d2c6fad9
|
Fixed invalid comment (#3327)
|
5 years ago |
|
omar
|
ab4ef822f0
|
Version 1.78 WIP
|
5 years ago |
|
omar
|
90ea7e2f2f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
5 years ago |
Rokas Kupstys
|
0738611559
|
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
|
5 years ago |
|
omar
|
ddabfc3477
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
5 years ago |
|
omar
|
9418dcb693
|
Version 1.77
+ fix minor clang-tidy warnings which seems reasonable
|
5 years ago |
|
omar
|
7538bbabb6
|
Demo: Commented out ideas on another way to center a window.
|
5 years ago |
|
omar
|
e1d7e14717
|
Viewports: used main viewport for centering (wip), clarified the meaning of how ImGuiPlatformMonitor WorkPos/WorkSize should be set if unknown, added asserts.
|
5 years ago |
|
omar
|
a616ff5d4a
|
BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)
# Conflicts:
# imgui.cpp
|
5 years ago |
|
omar
|
b83a1f3b00
|
BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)
|
5 years ago |
|
omar
|
20d61f5f62
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
5 years ago |
|
omar
|
8ead38c100
|
Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.
|
5 years ago |
|
omar
|
704723744e
|
Disabled latest overzealous warnings from Clang
|
5 years ago |