examples(calendar): update and fix compile
This commit is contained in:
parent
cdf4eafc9e
commit
f39ad728c9
2 changed files with 7 additions and 5 deletions
|
|
@ -84,7 +84,7 @@ impl cosmic::Application for App {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Creates a view after each update.
|
/// Creates a view after each update.
|
||||||
fn view(&self) -> Element<Self::Message> {
|
fn view(&self) -> Element<'_, Self::Message> {
|
||||||
let mut content = cosmic::widget::column().spacing(12);
|
let mut content = cosmic::widget::column().spacing(12);
|
||||||
|
|
||||||
let calendar = cosmic::widget::calendar(
|
let calendar = cosmic::widget::calendar(
|
||||||
|
|
@ -111,7 +111,7 @@ impl App
|
||||||
where
|
where
|
||||||
Self: cosmic::Application,
|
Self: cosmic::Application,
|
||||||
{
|
{
|
||||||
fn update_title(&mut self) -> Task<Message> {
|
fn update_title(&mut self) -> cosmic::app::Task<Message> {
|
||||||
self.set_header_title(String::from("Calendar Demo"));
|
self.set_header_title(String::from("Calendar Demo"));
|
||||||
self.set_window_title(String::from("Calendar Demo"))
|
self.set_window_title(String::from("Calendar Demo"))
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ use crate::iced_core::{Alignment, Length, Padding};
|
||||||
use crate::widget::{Grid, button, column, grid, icon, row, text};
|
use crate::widget::{Grid, button, column, grid, icon, row, text};
|
||||||
use apply::Apply;
|
use apply::Apply;
|
||||||
use chrono::{Datelike, Days, Local, Month, Months, NaiveDate, Weekday};
|
use chrono::{Datelike, Days, Local, Month, Months, NaiveDate, Weekday};
|
||||||
|
use iced::alignment::Vertical;
|
||||||
|
|
||||||
/// A widget that displays an interactive calendar.
|
/// A widget that displays an interactive calendar.
|
||||||
pub fn calendar<M>(
|
pub fn calendar<M>(
|
||||||
|
|
@ -156,17 +157,17 @@ where
|
||||||
))
|
))
|
||||||
.size(18);
|
.size(18);
|
||||||
|
|
||||||
|
let day = text::body(translate_weekday!(this.model.visible.weekday()));
|
||||||
|
|
||||||
let month_controls = row::with_capacity(2)
|
let month_controls = row::with_capacity(2)
|
||||||
.push(
|
.push(
|
||||||
icon::from_name("go-previous-symbolic")
|
icon::from_name("go-previous-symbolic")
|
||||||
.apply(button::icon)
|
.apply(button::icon)
|
||||||
.padding([0, 12])
|
|
||||||
.on_press((this.on_prev)()),
|
.on_press((this.on_prev)()),
|
||||||
)
|
)
|
||||||
.push(
|
.push(
|
||||||
icon::from_name("go-next-symbolic")
|
icon::from_name("go-next-symbolic")
|
||||||
.apply(button::icon)
|
.apply(button::icon)
|
||||||
.padding([0, 12])
|
|
||||||
.on_press((this.on_next)()),
|
.on_press((this.on_next)()),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -216,10 +217,11 @@ where
|
||||||
|
|
||||||
let content_list = column::with_children([
|
let content_list = column::with_children([
|
||||||
row::with_children([
|
row::with_children([
|
||||||
date.into(),
|
column().push(date).push(day).into(),
|
||||||
crate::widget::Space::with_width(Length::Fill).into(),
|
crate::widget::Space::with_width(Length::Fill).into(),
|
||||||
month_controls.into(),
|
month_controls.into(),
|
||||||
])
|
])
|
||||||
|
.align_y(Vertical::Center)
|
||||||
.padding([12, 20])
|
.padding([12, 20])
|
||||||
.into(),
|
.into(),
|
||||||
calendar_grid.into(),
|
calendar_grid.into(),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue