leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes to better match design

Browse source
This commit is contained in:
Jeremy Soller 2024-07-03 14:24:11 -06:00
parent 9628642409
commit 66cef478ba
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
1 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/dialog.rs
View file

@ -895,21 +895,10 @@ impl Application for App {
Message::Filter, Message::Filter,
)); ));
} }
if let DialogKind::SaveFile { filename } = &self.flags.kind {
row = row.push(
widget::text_input("", filename)
.id(self.filename_id.clone())
.on_input(Message::Filename)
.on_submit(Message::Save(false)),
);
} else {
row = row.push(widget::horizontal_space(Length::Fill));
}
for (choice_i, choice) in self.choices.iter().enumerate() { for (choice_i, choice) in self.choices.iter().enumerate() {
match choice { match choice {
DialogChoice::CheckBox { label, value, .. } => { DialogChoice::CheckBox { label, value, .. } => {
row = row.push(widget::text::body(label)); row = row.push(widget::checkbox(label, *value, move |checked| {
row = row.push(widget::checkbox("", *value, move |checked| {
Message::Choice(choice_i, if checked { 1 } else { 0 }) Message::Choice(choice_i, if checked { 1 } else { 0 })
})); }));
} }
@ -919,13 +908,23 @@ impl Application for App {
selected, selected,
.. ..
} => { } => {
row = row.push(widget::text::body(label)); row = row.push(widget::text::heading(label));
row = row.push(widget::dropdown(options, *selected, move |option_i| { row = row.push(widget::dropdown(options, *selected, move |option_i| {
Message::Choice(choice_i, option_i) Message::Choice(choice_i, option_i)
})); }));
} }
} }
} }
if let DialogKind::SaveFile { filename } = &self.flags.kind {
row = row.push(
widget::text_input("", filename)
.id(self.filename_id.clone())
.on_input(Message::Filename)
.on_submit(Message::Save(false)),
);
} else {
row = row.push(widget::horizontal_space(Length::Fill));
}
row = row.push(widget::button::standard(fl!("cancel")).on_press(Message::Cancel)); row = row.push(widget::button::standard(fl!("cancel")).on_press(Message::Cancel));
row = row.push(if self.flags.kind.save() { row = row.push(if self.flags.kind.save() {
widget::button::suggested(&self.accept_label).on_press(Message::Save(false)) widget::button::suggested(&self.accept_label).on_press(Message::Save(false))