Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: ScrollArea #4770

Closed
wants to merge 6 commits into from
Closed

Fix: ScrollArea #4770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8612a7
Update scroll_area.rs
rustbasic Jul 3, 2024
8db7e0f
Update style.rs
rustbasic Jul 3, 2024
b036f1b
Update scroll_area.rs
rustbasic Jul 3, 2024
50b202c
Update style.rs
rustbasic Jul 3, 2024
e77e206
Merge branch 'emilk:master' into patch73
rustbasic Jul 3, 2024
ccc9b7d
Update style.rs
rustbasic Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 24 additions & 30 deletions crates/egui/src/containers/scroll_area.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,19 +963,30 @@ impl Prepared {
let inner_margin = show_factor * scroll_style.bar_inner_margin;
let outer_margin = show_factor * scroll_style.bar_outer_margin;

let mut max_cross = outer_rect.max[1 - d] - outer_margin;
if ui.clip_rect().max[1 - d] < max_cross + outer_margin {
// Move the scrollbar so it is visible. This is needed in some cases.
// For instance:
// * When we have a vertical-only scroll area in a top level panel,
// and that panel is not wide enough for the contents.
// * When one ScrollArea is nested inside another, and the outer
// is scrolled so that the scroll-bars of the inner ScrollArea (us)
// is outside the clip rectangle.
// Really this should use the tighter clip_rect that ignores clip_rect_margin, but we don't store that.
// clip_rect_margin is quite a hack. It would be nice to get rid of it.
max_cross = ui.clip_rect().max[1 - d] - outer_margin;
}

// top/bottom of a horizontal scroll (d==0).
// left/rigth of a vertical scroll (d==1).
let mut cross = if scroll_style.floating {
// The bounding rect of a fully visible bar.
// When we hover this area, we should show the full bar:
let cross = if scroll_style.floating {
let max_bar_rect = if d == 0 {
outer_rect.with_min_y(outer_rect.max.y - outer_margin - scroll_style.bar_width)
outer_rect.with_min_y(max_cross - scroll_style.bar_width)
} else {
outer_rect.with_min_x(outer_rect.max.x - outer_margin - scroll_style.bar_width)
outer_rect.with_min_x(max_cross - scroll_style.bar_width)
};

let is_hovering_bar_area = is_hovering_outer_rect
&& ui.rect_contains_pointer(max_bar_rect)
let is_hovering_bar_area = (is_hovering_outer_rect
&& ui.rect_contains_pointer(max_bar_rect))
|| state.scroll_bar_interaction[d];

let is_hovering_bar_area_t = ui
Expand All @@ -988,39 +999,22 @@ impl Prepared {
is_hovering_bar_area_t,
);

let max_cross = outer_rect.max[1 - d] - outer_margin;
let min_cross = max_cross - width;
Rangef::new(min_cross, max_cross)
} else {
let min_cross = inner_rect.max[1 - d] + inner_margin;
let max_cross = outer_rect.max[1 - d] - outer_margin;
let min_cross = max_cross - scroll_style.bar_width;
Rangef::new(min_cross, max_cross)
};

if ui.clip_rect().max[1 - d] < cross.max + outer_margin {
// Move the scrollbar so it is visible. This is needed in some cases.
// For instance:
// * When we have a vertical-only scroll area in a top level panel,
// and that panel is not wide enough for the contents.
// * When one ScrollArea is nested inside another, and the outer
// is scrolled so that the scroll-bars of the inner ScrollArea (us)
// is outside the clip rectangle.
// Really this should use the tighter clip_rect that ignores clip_rect_margin, but we don't store that.
// clip_rect_margin is quite a hack. It would be nice to get rid of it.
let width = cross.max - cross.min;
cross.max = ui.clip_rect().max[1 - d] - outer_margin;
cross.min = cross.max - width;
}

let outer_scroll_rect = if d == 0 {
Rect::from_min_max(
pos2(inner_rect.left(), cross.min),
pos2(inner_rect.right(), cross.max),
pos2(inner_rect.left(), cross.min - inner_margin),
pos2(inner_rect.right(), cross.max + outer_margin),
)
} else {
Rect::from_min_max(
pos2(cross.min, inner_rect.top()),
pos2(cross.max, inner_rect.bottom()),
pos2(cross.min - inner_margin, inner_rect.top()),
pos2(cross.max + outer_margin, inner_rect.bottom()),
)
};

Expand Down
11 changes: 6 additions & 5 deletions crates/egui/src/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,7 @@ impl ScrollStyle {
Self {
floating: true,
bar_width: 10.0,
bar_inner_margin: 0.0,
floating_allocated_width: 6.0,
foreground_color: false,

Expand All @@ -571,6 +572,7 @@ impl ScrollStyle {
Self {
floating: true,
bar_width: 10.0,
bar_inner_margin: 0.0,
foreground_color: true,
floating_allocated_width: 0.0,
dormant_background_opacity: 0.0,
Expand Down Expand Up @@ -646,6 +648,10 @@ impl ScrollStyle {
ui.add(DragValue::new(handle_min_length).range(0.0..=32.0));
ui.label("Minimum handle length");
});
ui.horizontal(|ui| {
ui.add(DragValue::new(bar_inner_margin).range(0.0..=32.0));
ui.label("Inner margin");
});
ui.horizontal(|ui| {
ui.add(DragValue::new(bar_outer_margin).range(0.0..=32.0));
ui.label("Outer margin");
Expand Down Expand Up @@ -681,11 +687,6 @@ impl ScrollStyle {
opacity_ui(ui, interact_handle_opacity);
ui.end_row();
});
} else {
ui.horizontal(|ui| {
ui.add(DragValue::new(bar_inner_margin).range(0.0..=32.0));
ui.label("Inner margin");
});
}
}
}
Expand Down
Loading