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

fix: default to changing y axis when changing data aspect (#2087)

Browse source
This commit is contained in:
Tobias Schmitz 2022-10-02 14:32:37 +02:00 committed by GitHub
parent aa1536f1a7
commit 981fdb3932
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/egui/src/widgets/plot/mod.rs
View file

@ -79,6 +79,13 @@ struct AxisBools {
y: bool, y: bool,
} }
impl AxisBools {
#[inline]
fn any(&self) -> bool {
self.x || self.y
}
}
impl From<bool> for AxisBools { impl From<bool> for AxisBools {
fn from(val: bool) -> Self { fn from(val: bool) -> Self {
AxisBools { x: val, y: val } AxisBools { x: val, y: val }
@ -843,8 +850,10 @@ impl Plot {
if let Some(linked_axes) = &linked_axes { if let Some(linked_axes) = &linked_axes {
let change_x = linked_axes.link_y && !linked_axes.link_x; let change_x = linked_axes.link_y && !linked_axes.link_x;
transform.set_aspect_by_changing_axis(data_aspect as f64, change_x); transform.set_aspect_by_changing_axis(data_aspect as f64, change_x);
} else { } else if auto_bounds.any() {
transform.set_aspect_by_expanding(data_aspect as f64); transform.set_aspect_by_expanding(data_aspect as f64);
} else {
transform.set_aspect_by_changing_axis(data_aspect as f64, false);
} }
} }