leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify nav button and add pick list

Browse source
This commit is contained in:
Jeremy Soller 2022-09-30 11:14:44 -06:00
parent 153437b3b0
commit 472135df09
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
3 changed files with 53 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/widget/mod.rs
View file

@ -7,8 +7,8 @@ pub use self::icon::*;
mod list;
pub use list::*;
mod nav_bar;
pub use nav_bar::*;
mod nav;
pub use nav::*;
mod toggler;
pub use toggler::*;

23
src/widget/nav_bar.rs → src/widget/nav.rs
View file

@ -9,9 +9,12 @@ use iced::{
macro_rules! nav_bar {
($($x:expr),+ $(,)?) => (
$crate::iced::widget::Container::new(
$crate::iced::widget::Column::with_children(
vec![$($crate::iced::Element::from($x)),+]
)
$crate::iced::widget::Column::with_children(vec![
$($crate::iced::Element::from($x)),+,
$crate::iced::widget::vertical_space(
$crate::iced::Length::Fill
).into()
])
.spacing(12)
)
.max_width(300)
@ -37,3 +40,17 @@ pub fn nav_bar_style(theme: &Theme) -> widget::container::Appearance {
border_color: Color::TRANSPARENT,
}
}
#[macro_export]
macro_rules! nav_button {
($icon: expr, $title:expr) => (
$crate::widget::button!(
$crate::widget::icon($icon, 16),
$crate::iced::widget::Text::new($title),
$crate::iced::widget::horizontal_space(
$crate::iced::Length::Fill
),
)
);
}
pub use nav_button;