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
|
2020-08-10 11:35:51 +02:00 |
|
omar
|
fc61018b1c
|
Demo: Renamed "Layout" -> "Layout & Scrolling". Fixed usage of local struct as template class (c++11).
|
2020-08-05 17:10:06 +02:00 |
|
omar
|
473a01adb0
|
Scrolling: Avoid SetScroll, SetScrollFromPos functions from snapping on the edge of scroll limits. (#3379) + Demo: Rename "Layout" to "Layout & Scrolling".
|
2020-08-05 17:09:40 +02:00 |
|
omar
|
db886f3953
|
Demo: Rework Clipping section. Fix for static analysis. Added bindings in Readme.
|
2020-08-05 10:43:42 +02:00 |
|
omar
|
963839373c
|
Demo tweaks + general removal of the word dummy were possible with no issues (kept the API call).
|
2020-08-03 21:31:42 +02:00 |
|
omar
|
de1588928b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-08-03 19:54:31 +02:00 |
|
omar
|
55041ac3be
|
Demo: Removed thin triangle and aligned code.
|
2020-08-03 19:46:26 +02:00 |
|
omar
|
912c45ab23
|
Demo: Improve "Custom Rendering"->"Canvas" demo with a grid, scrolling and context menu.
|
2020-08-03 19:46:25 +02:00 |
|
omar
|
70fa37527d
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_draw.cpp
# imgui_internal.h
|
2020-07-29 15:15:14 +02:00 |
|
omar
|
218ff3a2a5
|
Internals: Backport one ->WasActive test in NavRestoreLastChildNavWindow() from 9bf6509c6 + minor/shallow bits from docking branch.
|
2020-07-29 15:11:24 +02:00 |
|
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)
|
2020-07-23 19:05:18 +02:00 |
|
omar
|
4be8155002
|
Style Editor: Added preview of circle auto-tessellation when editing the corresponding value..
|
2020-07-16 21:51:49 +02:00 |
|
omar
|
825f2ae455
|
Demo: Tweak "child windows" section. (#3318)
|
2020-07-16 17:20:24 +02:00 |
|
omar
|
f79f0e42f7
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.h
|
2020-07-14 18:38:47 +02:00 |
|
omar
|
3a6c9907cd
|
Texture-based thick lines: Minor tweaks and rename toward merging in master. Changes to allow changing AA_SIZE (disable texture path).
|
2020-07-08 20:18:41 +02:00 |
|
omar
|
78d6bdf080
|
Texture-based thick lines: Remove unnecessary indirection in fetching UV data, removed lerp call, renames, tweaks.
|
2020-07-08 17:38:02 +02:00 |
|
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
|
2020-07-08 17:38:02 +02:00 |
|
omar
|
222b7ddbfa
|
Texture-based thick lines: Tweaks, fix for truetype builder.
|
2020-07-08 17:38:01 +02:00 |
|
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
|
2020-07-08 17:38:01 +02:00 |
|
Ben Carter
|
1d3c3070d8
|
Texture-based thick lines: Initial version of AA line drawing using textures (press SHIFT to enable)
|
2020-07-08 17:38:01 +02:00 |
|
Ben Carter
|
8e4046e13b
|
Atlas build use GetCustomRectByIndex() + comments, rename, and shallow merge from tex_antialiasing_lines branch.
|
2020-07-08 17:25:40 +02:00 |
|
omar
|
a1d2c6fad9
|
Fixed invalid comment (#3327)
|
2020-06-30 19:00:31 +02:00 |
|
omar
|
ab4ef822f0
|
Version 1.78 WIP
|
2020-06-30 16:56:09 +02:00 |
|
omar
|
90ea7e2f2f
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-06-30 16:43:16 +02:00 |
|
Rokas Kupstys
|
0738611559
|
Misc: Bunch of code formatting changes suggested by a pass running 'astyle'
|
2020-06-30 16:37:21 +02:00 |
|
omar
|
ddabfc3477
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2020-06-29 17:15:40 +02:00 |
|
omar
|
9418dcb693
|
Version 1.77
+ fix minor clang-tidy warnings which seems reasonable
|
2020-06-29 15:54:28 +02:00 |
|
omar
|
7538bbabb6
|
Demo: Commented out ideas on another way to center a window.
|
2020-06-23 19:01:40 +02:00 |
|
omar
|
e1d7e14717
|
Viewports: used main viewport for centering (wip), clarified the meaning of how ImGuiPlatformMonitor WorkPos/WorkSize should be set if unknown, added asserts.
|
2020-06-23 18:42:01 +02:00 |
|
omar
|
a616ff5d4a
|
BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)
# Conflicts:
# imgui.cpp
|
2020-06-23 17:54:55 +02:00 |
|
omar
|
b83a1f3b00
|
BeginPopupModal() doesn't set the ImGuiWindowFlags_NoSavedSettings flag anymore, and will not always be auto-centered. (#915, #3091)
|
2020-06-23 17:52:13 +02:00 |
|
omar
|
20d61f5f62
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-20 22:06:01 +02:00 |
|
omar
|
8ead38c100
|
Clang: Reduce uses of __has_warning for overall sanity, as compilers are hostile to software targetting multiple compiler version.
|
2020-06-18 17:02:24 +02:00 |
|
omar
|
704723744e
|
Disabled latest overzealous warnings from Clang
|
2020-06-18 16:19:51 +02:00 |
|
ocornut
|
37eb89371b
|
Popups: Internals: Added IsAnyPopupOpen().
|
2020-06-16 18:46:25 +02:00 |
|
ocornut
|
99ab521024
|
Renamed OpenPopupOnItemClick() to OpenPopupContextItem(). Kept inline redirection function (will obsolete). + Removed CalcItemRectClosestPoint() entry point
|
2020-06-15 22:12:38 +02:00 |
|
ocornut
|
2665288b30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-11 11:36:38 +02:00 |
|
ocornut
|
40b799023b
|
Docs: Update fonts.md (#2861) + update all references to FONTS.txt
|
2020-06-09 16:56:48 +02:00 |
|
ocornut
|
8baa4ccff5
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2020-06-06 20:31:24 +02:00 |
|
ocornut
|
41e8837f59
|
Comments, adding some spacing in ImVec2() constructors.
|
2020-06-02 18:13:54 +02:00 |
|
omar
|
582f4db59b
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_demo.cpp
# imgui_internal.h
|
2020-05-07 22:13:47 +02:00 |
|
omar
|
673d6df85f
|
Demo: Clamping font scale. Added helpers in demo. Comments. Update sponsors. (#3206)
|
2020-05-07 11:45:41 +02:00 |
|
omar
|
f152fac4f1
|
Demo: Wrapped many (not all) code and comments lines to 120 characters to fit below GitHub viewer limit. (#3193)
|
2020-05-05 21:33:16 +02:00 |
|
omar
|
419f905f91
|
Demo: Extracted some code out of ShowStyleEditor() into NodeFont().
|
2020-05-05 19:53:54 +02:00 |
|
omar
|
5116eee108
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-05-04 15:05:07 +02:00 |
|
Ryan Pavlik
|
8cbff5ccb2
|
Fix various typos. (#3161)
(found by Debian's lintian on a package that uses imgui.)
(found by codespell.)
|
2020-04-28 16:10:15 +02:00 |
|
ocornut
|
266dff9bed
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui_internal.h
|
2020-04-20 11:33:56 +02:00 |
|
omar
|
54b38d88f7
|
TreeNode: Fixed bug where BeginDragDropSource() failed when the _OpenOnDoubleClick flag is set. Added basic demo code. (Amend 05420ea)
|
2020-04-15 12:31:51 +02:00 |
|
omar
|
e8c986b34e
|
Version 1.77 WIP
|
2020-04-14 14:55:50 +02:00 |
|
omar
|
b8e2b2bd6b
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/imgui_impl_opengl3.cpp
# imgui.cpp
|
2020-04-12 20:24:18 +02:00 |
|