chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

verse_chips ui tweak to always show edit button

Browse source
This commit is contained in:
Chris Cochrun 2026-02-02 13:15:26 -06:00
parent 412aace66f
commit 2f2501110f
1 changed files with 43 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/ui/song_editor.rs
View file

@ -614,20 +614,21 @@ impl SongEditor {
// .label("Verse Order")
// .on_input(Message::ChangeVerseOrder);
let verse_chips: Vec<Element<Message>> = if let Some(song) =
&self.song
{
if let Some(verse_map) = &song.verse_map {
verse_map
.keys()
.sorted()
.map(|verse| {
let verse = *verse;
let chip =
verse_chip(verse).map(|()| Message::None);
let verse_chip_wrapped =
RcElementWrapper::<Message>::new(chip);
Element::from(
let verse_option_chips: Vec<Element<Message>> =
if let Some(song) = &self.song {
if let Some(verse_map) = &song.verse_map {
verse_map
.keys()
.sorted()
.map(|verse| {
let verse = *verse;
let chip = verse_chip(verse)
.map(|()| Message::None);
let verse_chip_wrapped =
RcElementWrapper::<Message>::new(
chip,
);
Element::from(
dnd_source::<Message, Box<VerseName>>(
verse_chip_wrapped.clone(),
)
@ -663,14 +664,24 @@ impl SongEditor {
},
),
)
})
.collect()
})
.collect()
} else {
vec![]
}
} else {
vec![]
}
} else {
vec![]
};
};
let verse_options = container(
scrollable(row(verse_option_chips).spacing(space_s))
.direction(Direction::Horizontal(
Scrollbar::new().spacing(space_s),
)),
)
.padding(space_s)
.width(Length::Fill)
.class(theme::Container::Primary);
let verse_chips_edit_toggle =
button::icon(if self.editing_verse_order {
@ -680,17 +691,6 @@ impl SongEditor {
})
.on_press(Message::EditVerseOrder);
let verse_options = container(
scrollable(row(verse_chips).spacing(space_s)).direction(
Direction::Horizontal(
Scrollbar::new().spacing(space_s),
),
),
)
.padding(space_s)
.width(Length::Fill)
.class(theme::Container::Primary);
let verse_order_items: Vec<Element<Message>> = if let Some(
song,
) =
@ -768,13 +768,18 @@ impl SongEditor {
)
};
let verse_order = container(row![
scrollable(verse_order_items)
.direction(Direction::Horizontal(Scrollbar::new()))
.spacing(space_s),
horizontal_space(),
verse_chips_edit_toggle
])
let verse_order = container(
row![
scrollable(verse_order_items)
.direction(
Direction::Horizontal(Scrollbar::new())
)
.width(Length::Fill)
.spacing(space_s),
verse_chips_edit_toggle
]
.width(Length::Fill),
)
.padding(space_s)
.width(Length::Fill)
.class(theme::Container::Primary);