djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Fix scroll bar position (#392)" (#458)

Browse source 
This reverts commit 2932ff0e53.
This commit is contained in:
Emil Ernerfeldt 2021-06-04 00:11:35 +02:00 committed by GitHub
parent ec6268e4ac
commit 2af86cd2c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
egui/src/containers/scroll_area.rs
View file

@ -137,9 +137,9 @@ impl ScrollArea {
), ),
*ui.layout(), *ui.layout(),
); );
let content_clip_rect = inner_rect let mut content_clip_rect = inner_rect.expand(ui.visuals().clip_rect_margin);
.expand(ui.visuals().clip_rect_margin) content_clip_rect = content_clip_rect.intersect(ui.clip_rect());
.intersect(ui.clip_rect()); content_clip_rect.max.x = ui.clip_rect().max.x - current_scroll_bar_width; // Nice handling of forced resizing beyond the possible
content_ui.set_clip_rect(content_clip_rect); content_ui.set_clip_rect(content_clip_rect);
let viewport = Rect::from_min_size(Pos2::ZERO + state.offset, inner_size); let viewport = Rect::from_min_size(Pos2::ZERO + state.offset, inner_size);
@ -251,7 +251,7 @@ impl Prepared {
} }
let width = if inner_rect.width().is_finite() { let width = if inner_rect.width().is_finite() {
inner_rect.width() // Position scroll bar correctly inner_rect.width().max(content_size.x) // Expand width to fit content
} else { } else {
// ScrollArea is in an infinitely wide parent // ScrollArea is in an infinitely wide parent
content_size.x content_size.x