migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-01 14:20:04 -04:00
Code Activity

Allow multiple atoms in Button::shortcut_text and right_text (#7696)

Browse Source 
Useful when intermixing text and icons (e.g. for modifiers)
This commit is contained in:
Emil Ernerfeldt
2025-11-10 16:34:58 +01:00
committed by GitHub
parent fa4cfec777
commit 93425ae06b
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
crates/egui/src/widgets/button.rs
View File

@@ -223,22 +223,29 @@ impl<'a> Button<'a> {
///
/// See also [`Self::right_text`].
#[inline]
pub fn shortcut_text(mut self, shortcut_text: impl Into<Atom<'a>>) -> Self {
let mut atom = shortcut_text.into();
atom.kind = match atom.kind {
AtomKind::Text(text) => AtomKind::Text(text.weak()),
other => other,
};
pub fn shortcut_text(mut self, shortcut_text: impl IntoAtoms<'a>) -> Self {
self.layout.push_right(Atom::grow());
self.layout.push_right(atom);
for mut atom in shortcut_text.into_atoms() {
atom.kind = match atom.kind {
AtomKind::Text(text) => AtomKind::Text(text.weak()),
other => other,
};
self.layout.push_right(atom);
}
self
}
/// Show some text on the right side of the button.
#[inline]
pub fn right_text(mut self, right_text: impl Into<Atom<'a>>) -> Self {
pub fn right_text(mut self, right_text: impl IntoAtoms<'a>) -> Self {
self.layout.push_right(Atom::grow());
self.layout.push_right(right_text.into());
for atom in right_text.into_atoms() {
self.layout.push_right(atom);
}
self
}