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

Control Separator widths, and less clipping in ScrollArea #2665

Merged
master from
Feb 3, 2023
Merged

Control Separator widths, and less clipping in ScrollArea #2665

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55589a1
Add Separator::grow and Separator::shrink
emilk Feb 3, 2023
63c2a01
Be more conservative with the clipping in ScrollArea:s
emilk Feb 3, 2023
25c3244
Add test of the growing separator
emilk Feb 3, 2023
8aede5f
Improve test output
emilk Feb 3, 2023
e7baa3e
Update changelog
emilk Feb 3, 2023
bc661dd
Add back a little bit more clipping
emilk Feb 3, 2023
a2b8697
Make the minimum scroll handle length a bit longer
emilk Feb 3, 2023
4fd3b90
More clip rect tweaks
emilk Feb 3, 2023
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
Prev Previous commit
Next Next commit
Make the minimum scroll handle length a bit longer
  • Loading branch information
emilk committed Feb 3, 2023
commit a2b8697af31a12aaecdcb031ee36c6dae21ef481
2 changes: 1 addition & 1 deletion crates/egui/src/containers/scroll_area.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ impl Prepared {
),
)
};
let min_handle_size = ui.spacing().scroll_bar_width;
let min_handle_size = ui.spacing().scroll_handle_min_length;
if handle_rect.size()[d] < min_handle_size {
handle_rect = Rect::from_center_size(
handle_rect.center(),
Expand Down
9 changes: 9 additions & 0 deletions crates/egui/src/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,9 @@ pub struct Spacing {

pub scroll_bar_width: f32,

/// Make sure the scroll handle is at least this big
pub scroll_handle_min_length: f32,

/// Margin between contents and scroll bar.
pub scroll_bar_inner_margin: f32,
/// Margin between scroll bar and the outer container (e.g. right of a vertical scroll bar).
Expand Down Expand Up @@ -713,6 +716,7 @@ impl Default for Spacing {
tooltip_width: 600.0,
combo_height: 200.0,
scroll_bar_width: 8.0,
scroll_handle_min_length: 12.0,
scroll_bar_inner_margin: 4.0,
scroll_bar_outer_margin: 0.0,
indent_ends_with_horizontal_line: false,
Expand Down Expand Up @@ -1040,6 +1044,7 @@ impl Spacing {
indent_ends_with_horizontal_line,
combo_height,
scroll_bar_width,
scroll_handle_min_length,
scroll_bar_inner_margin,
scroll_bar_outer_margin,
} = self;
Expand Down Expand Up @@ -1072,6 +1077,10 @@ impl Spacing {
ui.add(DragValue::new(scroll_bar_width).clamp_range(0.0..=32.0));
ui.label("Scroll-bar width");
});
ui.horizontal(|ui| {
ui.add(DragValue::new(scroll_handle_min_length).clamp_range(0.0..=32.0));
ui.label("Scroll-bar handle min length");
});
ui.horizontal(|ui| {
ui.add(DragValue::new(scroll_bar_inner_margin).clamp_range(0.0..=32.0));
ui.label("Scroll-bar inner margin");
Expand Down