omar
|
9f35ba8546
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
|
2019-07-19 15:19:10 -07:00 |
|
omar
|
b443bc0a64
|
Columns: Improved honoring alignment with various values of ItemSpacing.x and WindowPadding.x. (#125, #2666)
|
2019-07-19 14:22:33 -07:00 |
|
omar
|
4abc2a82e0
|
Columns: Made the right-most edge reaches up to the clipping rectangle (removing WindowPadding.x*0.5 worth of asymmetrical/extraneous padding). (#125, #2666)
+ Moved a few things in BeginColumns().
|
2019-07-19 14:22:12 -07:00 |
|
omar
|
44336950e9
|
Revert "Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. (#125, #2666)"
This reverts commit 6c16ba6490.
|
2019-07-19 11:22:39 -07:00 |
|
omar
|
7fd34d4f30
|
Merge branch 'master' into docking
# Conflicts:
# imgui.cpp
# imgui_internal.h
|
2019-07-17 18:48:16 -07:00 |
|
omar
|
6c16ba6490
|
Columns: Improved honoring left-most and right-most alignment with various values of ItemSpacing.x and WindowPadding.x. In particular, the right-most edge now reaches up to the clipping rectangle while ensuring that the right-most column clipping width matches others. (#125, #2666)
|
2019-07-17 18:40:48 -07:00 |
|
omar
|
e28d20c3e2
|
Columns: Fixed a regression from 1.71 where the right-side of the contents rectangle within each column would wrongly use a WindowPadding.x instead of ItemSpacing.x like it always did. (#125, #2666)
|
2019-07-17 17:29:30 -07:00 |
|
omar
|
61c7f0194e
|
Misc: Made Button(), ColorButton() not trigger an "edited" event leading to IsItemDeactivatedAfterEdit() returning true. This also effectively make ColorEdit4() not incorrect trigger IsItemDeactivatedAfterEdit() when clicking the color button to open the picker popup. (#1875)
Demo: Added Button with repeater and InputFloat with +/- button to the status query test demo.
|
2019-07-17 17:10:28 -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
|
130b44994e
|
Debug, Metrics: Added "Tools->Item Picker" tool which allow clicking on a widget to break in the debugger within the item code. The tool calls IM_DEBUG_BREAK() which can be redefined in imconfig.h if needed.
|
2019-07-16 18:25:49 -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
|
3d07c7cbe4
|
TabBar: Fixed unfocused tab bar separator color (was using ImGuiCol_Tab, should use ImGuiCol_TabUnfocusedActive).
|
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
|
d52c6316c8
|
Renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Keep redirection typedef (will obsolete).
|
2019-07-12 11:58:46 +02:00 |
|
omar
|
3436132d4b
|
Combo: Hide arrow when there's not enough space even for the square button.
+ Various todo items.
|
2019-07-11 17:20:56 +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 |
|
omar
|
54c49b5fb1
|
Window: Mouse wheel scrolling while hovering a child window is automatically forwarded to parent window if ScrollMax is zero on the scrolling axis. Also still case if ImGuiWindowFlags_NoScrollWithMouse is set (not new), but previously the forwarding
would be disabled if ImGuiWindowFlags_NoScrollbar was set on the child window, which is not the case any more (amend #1502, #1380).
|
2019-07-02 18:33:50 +02:00 |
|
omar
|
e16564e67a
|
Scrollbar: Avoid overlapping the opposite side when window (often a child window) is forcibly too small.
|
2019-07-01 20:59:00 +02:00 |
|
omar
|
58c9f8a194
|
Misc: Added IMGUI_DISABLE_METRICS_WINDOW imconfig.h setting to explicitly compile out ShowMetricsWindow(). + Internals: Minor renaming.
|
2019-07-01 20:58:10 +02:00 |
|
omar
|
da29d77253
|
Added SetScrollXHere, SetScrollFromPosX: Changelog, demo, comments (#1580).
|
2019-07-01 12:15:53 +02:00 |
|
omar
|
2a3517a399
|
Internals: Checkbox: Added undocumented mixed/indeterminate/tristate support via ImGuiItemFlags_MixedValue. (#2644)
|
2019-06-30 12:03:09 +02:00 |
|
omar
|
1dd322c6fb
|
Style: Attenuated default opacity of ImGuiCol_Separator in Classic and Light styles.
|
2019-06-27 12:20:29 +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
|
e2c1f0a7cd
|
Merge branch 'master' into docking
# Conflicts:
# docs/CHANGELOG.txt
|
2019-06-18 23:12:50 +02:00 |
|
omar
|
dd41df3e98
|
Word-wrapping: Fixed overzealous word-wrapping when glyph edge lands exactly on the limit. Because of this, auto-fitting exactly unwrapped text would make it wrap. (fixes initial 1.15 commit, 78645a7d).
|
2019-06-18 12:50:34 +02:00 |
|
omar
|
516c3dee80
|
Examples: SDL+DX11: Changelog, readme, batch files, fixed vcxproj, minor stylistic fixes + minor sync of other main.cpp files. (#2632)
|
2019-06-18 11:28:26 +02:00 |
|
omar
|
70fe409338
|
Window: Fixed InnerClipRect right-most coordinates using wrong padding setting (introduced in 1.71).
|
2019-06-18 10:58:03 +02:00 |
|
Pavel Rojtberg
|
0e37eaff8a
|
Updated Ogre bindings (#2619)
And support python
|
2019-06-17 15:17:24 +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
|
b82e99c032
|
ImDrawList: Fixed CloneOutput() helper crashing. Also removed unnecessary risk from ImDrawList::Clear(), draw lists are being clear before use each frame anyway. (#1860)
|
2019-06-17 11:06:36 +02:00 |
|
omar
|
2645a2516f
|
ImDrawList::ChannelsSplit(), ImDrawListSlitter: Fixed an issue with merging draw commands between channels 0 and 1. (#2624) Introduced by cef88f6aae.
|
2019-06-14 12:07:43 +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
|
a8eb64fc54
|
Log/Capture: Fixed BeginTabItem() label not being included in a text log/capture.
Extracted tab rendering code into a RenderTextEllipsis() function.
|
2019-06-11 14:03:13 +02:00 |
|
omar
|
0770449630
|
Window: child windows outer decorations (e.g. scrollbar) are rendered as part of their parent window, avoiding the creation of an extraneous draw command.
+ Metrics: inverted color of clip rect vs vertices bounding box when hovering a draw command, so the color matches the per-vertex preview.
|
2019-06-07 17:34:36 +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
|
63310acd58
|
Synced/merged minor cruft from master branch to minimize drift. Only meaningful change AFAIK is removing ImGuiComboFlags_PopupAlignLeft flag from the tab list combo emitted by TabBar.
|
2019-06-06 16:16:18 +02:00 |
|
omar
|
431aa4e456
|
Synced/merged minor cruft from docking branch to minimize drift. AFAIK the only meaningful no-op change is that the call UpdateHoveredWindowAndCaptureFlags() was moved above UpdateMouseMovingNewFrame() to match what docking branch has been doing for a while.
|
2019-06-06 16:13:30 +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
|
c96f2c4057
|
Window: Fixed one case where auto-resize by double-clicking the resize grip would make either scrollbar appear for a single frame after the resize. Moved Scrollbar visibility block.
|
2019-06-05 15:59:14 +02:00 |
|
omar
|
c1a61d25a7
|
Scrollbar overlap an extra WindowBorderSize amount on the left to make all distances consistent. Reverted to BorderSize not affecting work/contents rectangles. Scrollbar, Style: Changed default style.ScrollbarSize from 16 to 14.
|
2019-06-05 15:59:14 +02:00 |
|