omar
|
b8d8355f10
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-07-31 14:34:58 -07:00 |
|
omar
|
6a0d0dab5a
|
Version 1.72b (patch for nav)
|
2019-07-31 14:31:06 -07:00 |
|
omar
|
9183e7c426
|
Version 1.73 WIP
|
2019-07-29 15:54:32 -07:00 |
|
omar
|
a1164399b0
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-07-27 18:21:41 -07:00 |
|
omar
|
ecb9b1e2eb
|
Version 1.72
|
2019-07-27 18:15:07 -07:00 |
|
omar
|
d057550209
|
Fixed Clang 8.0 warning "empty expression statement has no effect; remove unnecessary ';' to silence this" warning [-Wextra-semi-stmt]
+ Comment
|
2019-07-24 17:07:05 -07:00 |
|
omar
|
e5b905481d
|
Viewport: Refactored ViewportFlagsOverrideMask+ViewportFlagsOverrideValue into ViewportFlagsOverrideSet+ViewportFlagsOverrideClear which appears easier to grasp. (#1542)
(cherry picked from commit 9437630872e7ca19065bee78fcafaab54a0d5bf2)
|
2019-07-24 13:45:18 -07:00 |
|
omar
|
81b24bd728
|
Docking: Moving types in imgui.h
|
2019-07-23 13:37:52 -07:00 |
|
omar
|
db2581bee9
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-23 13:35:01 -07:00 |
|
omar
|
51853292cc
|
ImDrawList: Using ImDrawCornerFlags instead of int in various apis.
Demo: Using ImGuiColorEditrFlags instead of int.
|
2019-07-23 10:41:48 -07:00 |
|
omar
|
0e6a096afd
|
Docking: Renamed io.ConfigDockingTabBarOnSingleWindows to io.ConfigDockingAlwaysTabBar. (#2109)
Added ImGuiWindowClass::DockingAlwaysTabBar to set on individual windows.
|
2019-07-22 11:29:22 -07:00 |
|
omar
|
6f8d34768d
|
Docking: Removed seemingly unnecessary test in TabItemEx() for undocking tab leading to window move. Added ImGuiDockNode::IsFloatingNode() helper to clarify code intent in various places.
|
2019-07-22 11:02:44 -07:00 |
|
omar
|
9cda3035fd
|
Merge branch 'master' into docking
# Conflicts:
# examples/imgui_impl_dx10.cpp
# examples/imgui_impl_dx11.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
|
2019-07-22 10:29:14 -07:00 |
|
omar
|
363d33f64e
|
Increased IMGUI_VERSION_NUM to facilitate transition of OSX clipboard support for framework using/embedding any version of imgui. Amend 29d9394 . (#2546)
|
2019-07-22 10:23:27 -07:00 |
|
omar
|
f0348ddffc
|
Amend 0f86116 , renamed to ImGuiKey_KeyPadEnter Changelog.. (#2677, #2005)
|
2019-07-21 18:39:50 -07:00 |
|
Aaron Cooper
|
0f86116a69
|
Adding an ImGuiKey 'ImGuiKey_EnterSecondary' to support platforms that differentiate the enter (return key) and the numpad enter key.
|
2019-07-21 18:29:11 -07:00 |
|
omar
|
7fd34d4f30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-07-17 18:48:16 -07:00 |
|
omar
|
ea79992d9a
|
Fixed old SetWindowFontScale() api value from not being inherited by child window. Added comments about the right way to scale your UI (load a font at the right side, rebuild atlas, scale style).
+ Added missing IMGUI_API marker to the EmptyString storage used by ImGuiTextBuffer. (#2672)
|
2019-07-17 10:01:49 -07:00 |
|
omar
|
56e10f1c35
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui.h
|
2019-07-16 18:29:31 -07:00 |
|
omar
|
e6a286b3a5
|
Style: Added style.ColorButtonButton (left/right, defaults to ImGuiDir_Right) to move the color button of ColorEdit3/ColorEdit4 functions to either side of the inputs.
|
2019-07-16 16:43:21 -07:00 |
|
omar
|
a35f42f123
|
Removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete). (#581, #324)
|
2019-07-15 18:30:20 -07:00 |
|
omar
|
7a9d32acee
|
Fixed unnecessary test in UpdateMouseWheel() (thanks PVS).
TreeNodeBehavior: avoid computing bg_col for non-framed non-active tree nodes.
Comments, binaries update, minor typos.
|
2019-07-15 18:30:20 -07:00 |
|
omar
|
dd80db87a6
|
Viewport: Added ImGuiViewportFlags_NoAutoMerge to prevent merging into host viewport in a per-window basis via the ImGuiWindowClass override mechanism. (#1542)
|
2019-07-15 13:35:21 -07:00 |
|
omar
|
e461e7bc7a
|
Moved ImGuiColumnsFlags erroneously forward declared in imgui.h + demo bit.
|
2019-07-14 12:29:23 -07:00 |
|
omar
|
d52c6316c8
|
Renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Keep redirection typedef (will obsolete).
|
2019-07-12 11:58:46 +02:00 |
|
omar
|
e66799f79a
|
Prefixed internal structs exposed in imgui.h with a fully qualified name to facilitate auto-generation with cimgui.
|
2019-07-12 11:54:22 +02:00 |
|
omar
|
d23f1b1409
|
fonts/binary_to_compress: display error message when failing to open file + misc comments.
|
2019-07-10 12:58:11 +02:00 |
|
omar
|
1f54c16f52
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
|
2019-07-02 18:47:10 +02:00 |
|
kevreco
|
caf119a982
|
Added 'SetScrollHereX' and 'SetScrollFromPosX' (#1580)
|
2019-07-01 12:15:48 +02:00 |
|
omar
|
41e2d4b5ae
|
ImDrawListSplitter: Fixed memory leak when using low-level split api (was not affecting ImDrawList api, also this type was added in 1.71 and not advertised as a public-facing feature).
|
2019-06-20 16:09:45 +02:00 |
|
omar
|
f563e1a504
|
Internals: Renamed GetFrontMostPopupModal() to GetTopMostPopupModal() to be consistent. Renamed other locals to follow that terminology.
|
2019-06-19 18:16:38 +02:00 |
|
omar
|
adbbd17cb6
|
Addendum to #2635. Add support for multi-viewports in SDL+DX!! example. making all Win32-centric back-ends handle PlatformHandleRaw. Using the field to use/store the HWND for internal purpose in SDL/GLFW back-ends. (#1542)
|
2019-06-18 23:37:57 +02:00 |
|
Vincent Hamm
|
3e8eebfbec
|
Viewport: Added PlatformHandleRaw. Update SDL+DX11 example. (#1542, #2635)
|
2019-06-18 23:16:52 +02:00 |
|
omar
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-06-18 23:12:50 +02:00 |
|
omar
|
e9b92d1cef
|
Disable -Wpragmas warning in GCC to avoid relying on version checks, as unusual/forks/mods don't appear to always have same warning<>version. (#2618)
+ Fix version number in imgui.h
|
2019-06-17 11:32:00 +02:00 |
|
omar
|
b27fd87177
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# imgui.cpp
# imgui.h
|
2019-06-17 11:10:14 +02:00 |
|
omar
|
af3080b81b
|
Removed redirecting functions/enums that were obsoleted in version 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME.
|
2019-06-14 12:05:00 +02:00 |
|
omar
|
5286ecb8a7
|
Version 1.72 WIP
|
2019-06-14 11:58:58 +02:00 |
|
omar
|
d3d998a885
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
# examples/README.txt
# imgui.cpp
# imgui.h
# imgui_internal.h
# imgui_widgets.cpp
|
2019-06-12 18:40:50 +02:00 |
|
omar
|
2da1c66d15
|
Version 1.71 + comments
|
2019-06-12 18:30:06 +02:00 |
|
omar
|
4597632662
|
Readme, comments, dear imgui prefixes
|
2019-06-11 16:11:36 +02:00 |
|
omar
|
a9b5c834b6
|
ImDrawListSplitter: Don't merge draw commands when crossing a VtxOffset boundary + Renamed fields ImDrawChannels to consistently suggest those are internal structures.
|
2019-06-11 11:49:31 +02:00 |
|
omar
|
d8435c7710
|
ImDrawListSplitter: Fix idx offset when merging (cef88f6 ) (#2591)
|
2019-06-10 15:02:44 +02:00 |
|
omar
|
5f409c6fcc
|
Merge branch 'master' into docking
# Conflicts:
# examples/example_apple_opengl2/main.mm
# examples/example_emscripten/main.cpp
# examples/example_glfw_opengl2/main.cpp
# examples/example_glfw_opengl3/main.cpp
# examples/example_glfw_vulkan/main.cpp
# examples/example_glut_opengl2/main.cpp
# examples/example_sdl_opengl2/main.cpp
# examples/example_sdl_opengl3/main.cpp
# examples/example_sdl_vulkan/main.cpp
# examples/example_win32_directx10/main.cpp
# examples/example_win32_directx11/main.cpp
# examples/example_win32_directx12/main.cpp
# examples/example_win32_directx9/main.cpp
# examples/imgui_impl_glfw.cpp
# examples/imgui_impl_sdl.cpp
# imgui.cpp
# imgui_widgets.cpp
|
2019-06-06 16:20:12 +02:00 |
|
omar
|
fea5f70611
|
ImDrawCallback: Allow to override the signature of ImDrawCallback by #define-ing it. This is meant to facilitate custom rendering back-ends passing local render-specific data to the draw callback.
|
2019-06-06 15:28:37 +02:00 |
|
omar
|
480d57e6a2
|
Revert "Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. (#38, #103, #1172, #1231, #2489)"
This reverts commit 597c024904 .
|
2019-06-06 01:00:30 +02:00 |
|
omar
|
597c024904
|
Changed syntax for (very rarely used) IMGUI_OVERRIDE_DRAWVERT_STRUCT_LAYOUT mechanism, instead you only need to '#define ImDrawVert MyDrawVert' to use this feature, avoiding the need to declare the entire structure within an awkward macro. Using the old macro will now error with a message pointing you to the new method. (#38, #103, #1172, #1231, #2489)
|
2019-06-06 00:42:27 +02:00 |
|
omar
|
e6850891cc
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-06-05 16:09:06 +02:00 |
|
omar
|
a0994d74c2
|
Clarified behavior of SetNextWindowContentSize(). Content size is defined as the size available after removal of WindowPadding on each sides. So SetNextWindowContentSize(ImVec2(100,100)) + auto-resize will always allow submitting a 100x100 item without creating a scrollbar, regarding of WindowPadding.The exact meaning of ContentSize for decorated windows was previously ill-defined.
|
2019-06-05 15:59:13 +02:00 |
|
omar
|
b9874a2423
|
Comments about obsoleted features version. Todo. Clarify tab bar initial offset (useful if we decide to remove the half-windowpadding clip margin).
|
2019-06-05 15:58:49 +02:00 |
|