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

Update dialog to use footer

Browse source
This commit is contained in:
Jeremy Soller 2024-10-10 11:15:32 -06:00
parent 454c3baac1
commit c3d09c3885
No known key found for this signature in database
GPG key ID: D02FD439211AF56F
2 changed files with 87 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/dialog.rs
View file

@ -390,11 +390,13 @@ struct App {
impl App {
fn button_view(&self) -> Element<Message> {
let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing;
let cosmic_theme::Spacing {
space_xxs,
space_xs,
..
} = theme::active().cosmic().spacing;
let mut col = widget::column::with_capacity(2)
.spacing(space_xxs)
.padding(space_xxs);
let mut col = widget::column::with_capacity(2).spacing(space_xxs);
if let DialogKind::SaveFile { filename } = &self.flags.kind {
col = col.push(
widget::text_input("", filename)
@ -408,7 +410,6 @@ impl App {
if !self.filters.is_empty() { 1 } else { 0 } + self.choices.len() * 2 + 3,
)
.align_items(Alignment::Center)
.padding(space_xxs)
.spacing(space_xxs);
if !self.filters.is_empty() {
row = row.push(widget::dropdown(
@ -447,7 +448,10 @@ impl App {
col = col.push(row);
col.into()
widget::layer_container(col)
.layer(cosmic_theme::Layer::Primary)
.padding([space_xxs, space_xs])
.into()
}
fn preview<'a>(&'a self, kind: &'a PreviewKind) -> Element<'a, AppMessage> {
@ -786,6 +790,8 @@ impl Application for App {
}
fn dialog(&self) -> Option<Element<Message>> {
let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing;
//TODO: should gallery view just be a dialog?
if self.tab.gallery {
return Some(
@ -794,6 +800,7 @@ impl Application for App {
// Draw button row as part of the overlay
widget::container(self.button_view())
.width(Length::Fill)
.padding(space_xxs)
.style(theme::Container::WindowBackground)
.into(),
])
@ -806,8 +813,6 @@ impl Application for App {
None => return None,
};
let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing;
let dialog = match dialog_page {
DialogPage::NewFolder { parent, name } => {
let mut dialog = widget::dialog(fl!("create-new-folder"));
@ -883,6 +888,10 @@ impl Application for App {
Some(dialog.into())
}
fn footer(&self) -> Option<Element<Message>> {
Some(self.button_view())
}
fn header_end(&self) -> Vec<Element<Message>> {
let mut elements = Vec::with_capacity(3);
@ -1449,22 +1458,9 @@ impl Application for App {
/// Creates a view after each update.
fn view(&self) -> Element<Message> {
let mut tab_column = widget::column::with_capacity(2);
tab_column = tab_column.push(
//TODO: key binds for dialog
self.tab
.view(&self.key_binds)
.map(move |message| Message::TabMessage(message)),
);
tab_column = tab_column.push(self.button_view());
let content: Element<_> = tab_column.into();
// Uncomment to debug layout:
//content.explain(cosmic::iced::Color::WHITE)
content
self.tab
.view(&self.key_binds)
.map(move |message| Message::TabMessage(message))
}
fn subscription(&self) -> Subscription<Message> {