migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-06-26 22:53:14 -04:00
Code Activity

Properly associate the slider label with both the slider and the drag value

Browse Source
This commit is contained in:
Matt Campbell
2022-11-29 14:03:27 -06:00
parent a31d7dc4f2
commit 9473dbdde1
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
crates/egui/src/widgets/slider.rs
View File

@@ -756,7 +756,9 @@ impl<'a> Slider<'a> {
}
}
if self.show_value {
let slider_response = response.clone();
let value_response = if self.show_value {
let position_range = self.position_range(&response.rect);
let value_response = self.value_ui(ui, position_range);
if value_response.gained_focus()
@@ -768,12 +770,23 @@ impl<'a> Slider<'a> {
response = value_response.union(response);
} else {
// Use the slider id as the id for the whole widget
response = response.union(value_response);
response = response.union(value_response.clone());
}
}
Some(value_response)
} else {
None
};
if !self.text.is_empty() {
ui.add(Label::new(self.text.clone()).wrap(false));
let label_response = ui.add(Label::new(self.text.clone()).wrap(false));
// The slider already has an accessibility label via widget info,
// but sometimes it's useful for a screen reader to know
// that a piece of text is a label for another widget,
// e.g. so the text itself can be excluded from navigation.
slider_response.labelled_by(label_response.id);
if let Some(value_response) = value_response {
value_response.labelled_by(label_response.id);
}
}
response