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.

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

Take rounding into account when using Slider::trailing_fill #4308

Merged
merged 37 commits into from
Apr 21, 2024
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f0b7737
Update memory.rs
rustbasic Mar 23, 2024
3b98d7f
Update epi_integration.rs
rustbasic Mar 23, 2024
af5a7bb
Update memory.rs
rustbasic Mar 23, 2024
7f66b56
Update memory.rs
rustbasic Mar 23, 2024
6396c4a
Update epi_integration.rs
rustbasic Mar 23, 2024
9fe42ff
Merge branch 'emilk:master' into master
rustbasic Mar 25, 2024
d7673fe
Merge branch 'emilk:master' into master
rustbasic Mar 25, 2024
a7edc53
Merge branch 'emilk:master' into master
rustbasic Mar 26, 2024
2432784
Merge branch 'emilk:master' into master
rustbasic Mar 27, 2024
9b6209b
Merge branch 'emilk:master' into master
rustbasic Mar 27, 2024
f3687f6
Merge branch 'emilk:master' into master
rustbasic Mar 28, 2024
78880de
Merge branch 'emilk:master' into master
rustbasic Mar 29, 2024
01ba2ec
Merge branch 'emilk:master' into master
rustbasic Mar 29, 2024
0ae2451
Merge branch 'emilk:master' into master
rustbasic Mar 29, 2024
e6c84ce
Merge branch 'emilk:master' into master
rustbasic Mar 30, 2024
821dff0
Update epi_integration.rs
rustbasic Mar 30, 2024
eecfafd
Merge branch 'emilk:master' into master
rustbasic Mar 30, 2024
cbb5ac7
Merge branch 'emilk:master' into master
rustbasic Mar 30, 2024
07b5143
Merge branch 'emilk:master' into master
rustbasic Mar 31, 2024
3313633
Update epi_integration.rs
rustbasic Mar 31, 2024
90b968c
Merge branch 'emilk:master' into master
rustbasic Apr 1, 2024
13af44f
Merge branch 'emilk:master' into master
rustbasic Apr 1, 2024
5d95f09
Merge branch 'emilk:master' into master
rustbasic Apr 1, 2024
4be440a
Merge branch 'emilk:master' into master
rustbasic Apr 1, 2024
1ef0e10
Merge branch 'emilk:master' into master
rustbasic Apr 2, 2024
ba99767
Update slider.rs
rustbasic Apr 2, 2024
89ece72
Update slider.rs
rustbasic Apr 2, 2024
dbea362
Update slider.rs
rustbasic Apr 2, 2024
8945afe
Update slider.rs
rustbasic Apr 2, 2024
adbd843
Update slider.rs
rustbasic Apr 2, 2024
88cb106
Update slider.rs
rustbasic Apr 2, 2024
e5c5d1e
Merge branch 'emilk:master' into patch34
rustbasic Apr 2, 2024
d94557d
Update slider.rs
rustbasic Apr 3, 2024
db7fa77
Merge branch 'emilk:master' into patch34
rustbasic Apr 3, 2024
c95bb8b
Merge branch 'emilk:master' into patch34
rustbasic Apr 3, 2024
e17d4dd
Merge branch 'emilk:master' into patch34
rustbasic Apr 5, 2024
f8d060d
Merge branch 'emilk:master' into patch34
rustbasic Apr 19, 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
18 changes: 10 additions & 8 deletions crates/egui/src/widgets/slider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -686,12 +686,10 @@ impl<'a> Slider<'a> {

let rail_radius = (spacing.slider_rail_height / 2.0).at_least(0.0);
let rail_rect = self.rail_rect(rect, rail_radius);
let rounding = widget_visuals.inactive.rounding;

ui.painter().rect_filled(
rail_rect,
widget_visuals.inactive.rounding,
widget_visuals.inactive.bg_fill,
);
ui.painter()
.rect_filled(rail_rect, rounding, widget_visuals.inactive.bg_fill);

let position_1d = self.position_from_value(value, position_range);
let center = self.marker_center(position_1d, &rail_rect);
Expand All @@ -707,13 +705,17 @@ impl<'a> Slider<'a> {

// The trailing rect has to be drawn differently depending on the orientation.
match self.orientation {
SliderOrientation::Vertical => trailing_rail_rect.min.y = center.y,
SliderOrientation::Horizontal => trailing_rail_rect.max.x = center.x,
SliderOrientation::Horizontal => {
trailing_rail_rect.max.x = center.x + rounding.nw;
}
SliderOrientation::Vertical => {
trailing_rail_rect.min.y = center.y - rounding.se;
}
};

ui.painter().rect_filled(
trailing_rail_rect,
widget_visuals.inactive.rounding,
rounding,
ui.visuals().selection.bg_fill,
);
}
Expand Down
Loading