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 |
|
kevreco
|
caf119a982
|
Added 'SetScrollHereX' and 'SetScrollFromPosX' (#1580)
|
2019-07-01 12:15:48 +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
|
a89f05a10e
|
Child windows inherit Hidden frames setting from parent more accurately, so HiddenFramesCannotSkipItems is honored by child windows.
|
2019-06-29 20:12:15 +02:00 |
|
omar
|
401e05147c
|
Internals: Moved CalcListClipping close to ImGuiListClipper code (no-op)
|
2019-06-29 20:11:03 +02:00 |
|
omar
|
82711251b6
|
Internals: ImGuiListClipper using absolute coordinate (instead of relative one). Minor no-op tweaks + ImDrawListSplitter assert
|
2019-06-29 20:10:55 +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
|
4b95e7c2f3
|
Doc: Tweak and extra mention of AddCustomRectFontGlyph + made the example register two rectangles.
|
2019-06-26 12:15:32 +02:00 |
|
omar
|
50d421fa19
|
Docking: Fixed GetBackgroundDrawList(), GetForegroundDrawList() overwriting ImDrawList flags after clear, leading to the AllowVtxOffset flag not being cleared. (#2638)
|
2019-06-26 09:52:25 +02:00 |
|
omar
|
eb3e271c24
|
Demo: Using ImVec2(-FLT_MIN,0.0f) instead of ImVec2(-1.0f,0.0f) where it makes sense. (#2449)
|
2019-06-23 18:20:25 +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
|
2cbc0f1287
|
Restore SLN which in Docking branch includes more projects.
|
2019-06-18 23:13:12 +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 |
|
Vincent Hamm
|
cc4d76cc23
|
Implement SDL/dx11 sample
|
2019-06-18 11:05:29 +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 |
|
Vincent Hamm
|
342751c89e
|
Fiedx OpenGL ES 3.0 include for iOS and tvOS (#2631)
|
2019-06-18 10:55:33 +02:00 |
|
Pavel Rojtberg
|
0e37eaff8a
|
Updated Ogre bindings (#2619)
And support python
|
2019-06-17 15:17:24 +02:00 |
|
omar
|
ae2c9f7101
|
Internals: Columns: Poke into WorkRect and use them in the GetContentRegionMax() functions. This should be a no-op, but preparing us to transition toward using WorkRect instead of ContentRegionRect.
Removed one use of ContentsRegionRect.
|
2019-06-17 12:14:34 +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
|
ca43436cd3
|
Fix monitor dpi info not being copied to main viewport when multi-viewports are not enabled. (#2621, #1676) + Tweaks, short path in FindPlatformMonitorForRect().
|
2019-06-17 11:19:34 +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
|
07d3083279
|
Docking: Fixed rendering of outer decoration happening on non-visible docked window (#2623, #2109). Revealed by 0770449. We are actually better than before now, as previously those would get unnecessarily get rendered into a hidden draw list.
|
2019-06-13 10:19:14 +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
|
5ae268c0a3
|
Internals: Reworked RenderTextEllipsis() to satisfy what we need for table headers.
|
2019-06-11 16:12:00 +02:00 |
|
omar
|
4597632662
|
Readme, comments, dear imgui prefixes
|
2019-06-11 16:11:36 +02:00 |
|
omar
|
c3a348aa25
|
CollapsingHeader: Minor fix to align right side of frames (which is extruded past the Work/Contents rect) with clipping rectangle.
|
2019-06-11 15:56:57 +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
|
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
|
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
|
afa3978ff6
|
Internals: Added drawlist and color arg to RenderArrow(), RenderBullet(). Reordered args for RenderPixelEllipsis.
|
2019-06-07 17:32:51 +02:00 |
|
omar
|
32ab0a82d6
|
imgui-test: Added IMGUI_TEST_ENGINE_LOG macro to emit into test log from core or user land.
|
2019-06-07 13:46:54 +02:00 |
|
omar
|
2b997141cf
|
Made PushID() behave the same in 32-bit and 64-bit, by not padding the integer into a void*. (Also technically faster.)
|
2019-06-06 16:36:26 +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 |
|