mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #109932 - GuillaumeGomez:source-code-scrollbar, r=notriddle

Browse Source 
Source code scrollbar

Fixes https://github.com/rust-lang/rust/issues/109865.

You can test it [here](https://rustdoc.crud.net/imperio/source-code-scrollbar/src/test_docs/lib.rs.html).

It seems to introduce a few regressions (at least change of behaviour) about the scroll "saving" though.

r? `@notriddle`
This commit is contained in:
Yuki Okushi 2023-04-05 20:47:23 +09:00 committed by GitHub
commit ee63b65007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librustdoc/html/static/css/rustdoc.css
View File

@ -392,6 +392,7 @@ img {
overflow-x: hidden;
/* The sidebar is by default hidden */
overflow-y: hidden;
z-index: 1;
}
.sidebar, .mobile-topbar, .sidebar-menu-toggle,
@ -535,6 +536,9 @@ ul.block, .block li {
.rustdoc .example-wrap > pre {
margin: 0;
flex-grow: 1;
}
.rustdoc:not(.source) .example-wrap > pre {
overflow: auto hidden;
}

8
tests/rustdoc-gui/source-code-page-code-scroll.goml Normal file
View File

@ -0,0 +1,8 @@
// Checks that the scrollbar is visible on the page rather than the code block.
goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html"
size: (800, 1000)
// "scrollWidth" should be superior than "clientWidth".
assert-property: ("body", {"scrollWidth": 1047, "clientWidth": 800})
// Both properties should be equal (ie, no scroll on the code block).
assert-property: (".example-wrap .rust", {"scrollWidth": 933, "clientWidth": 933})