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

New approach to the HeaderBar widget

Browse source
This commit is contained in:
Eduardo Flores 2022-10-09 02:35:03 -07:00 • committed by Michael Murphy
parent 5949eb8d89
commit 67ff797018
9 changed files with 435 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

204
src/widget/header_bar.rs Normal file
View file

@ -0,0 +1,204 @@
use apply::Apply;
use iced::{self, Element, Length, widget, alignment::Vertical, theme, Renderer};
use iced_lazy::Component;
pub struct HeaderBar<Message>
{
title: String,
nav_title: String,
sidebar_active: bool,
show_minimize: bool,
show_maximize: bool,
on_sidebar_active: Box<dyn Fn(bool) -> Message>,
on_close: Box<dyn Fn() -> Message>,
on_drag: Box<dyn Fn() -> Message>,
}
pub fn header_bar<Message>(
title: &str,
toggled: bool,
show_minimize: bool,
show_maximize: bool,
on_sidebar_active: impl Fn(bool) -> Message + 'static,
on_close: impl Fn() -> Message + 'static,
on_drag: impl Fn() -> Message + 'static,
) -> HeaderBar<Message> {
HeaderBar::new(
title,
toggled,
show_minimize,
show_maximize,
on_sidebar_active,
on_close,
on_drag
)
}
#[derive(Debug, Clone)]
pub enum HeaderEvent {
Close,
ToggleSidebar,
Drag,
Minimize,
Maximize
}
impl<Message> HeaderBar<Message> {
pub fn new(
title: &str,
toggled: bool,
show_minimize: bool,
show_maximize: bool,
on_sidebar_active: impl Fn(bool) -> Message + 'static,
on_close: impl Fn() -> Message + 'static,
on_drag: impl Fn() -> Message + 'static,
) -> Self {
Self {
title: String::from(title),
nav_title: String::new(),
sidebar_active: toggled,
show_minimize,
show_maximize,
on_sidebar_active: Box::new(on_sidebar_active),
on_close: Box::new(on_close),
on_drag: Box::new(on_drag),
}
}
pub fn title(mut self, title: &str) -> Self {
self.title = title.to_string();
self
}
pub fn nav_title(mut self, nav_title: &str) -> Self {
self.nav_title = nav_title.to_string();
self
}
pub fn sidebar_active(mut self, sidebar_active: bool) -> Self {
self.sidebar_active = sidebar_active;
self
}
pub fn show_minimize(mut self, show_minimize: bool) -> Self {
self.show_minimize = show_minimize;
self
}
pub fn show_maximize(mut self, show_maximize: bool) -> Self {
self.show_maximize = show_maximize;
self
}
}
impl<Message: Clone> Component<Message, Renderer> for HeaderBar<Message>
{
type State = ();
type Event = HeaderEvent;
fn update(
&mut self,
_state: &mut Self::State,
event: Self::Event,
) -> Option<Message> {
match event {
HeaderEvent::Close => Some((self.on_close)()),
HeaderEvent::ToggleSidebar => {
self.sidebar_active = !self.sidebar_active;
Some((self.on_sidebar_active)(self.sidebar_active))
},
HeaderEvent::Drag => Some((self.on_drag)()),
HeaderEvent::Minimize => None,
HeaderEvent::Maximize => None,
}
}
fn view(&self, _state: &Self::State) -> Element<Self::Event>
{
let nav_button = {
let text = widget::text(&self.nav_title)
.vertical_alignment(Vertical::Center)
.width(Length::Shrink)
.height(Length::Fill);
let icon = super::icon(
if self.sidebar_active {
"go-previous-symbolic"
} else {
"go-next-symbolic"
},
24,
)
.width(Length::Units(24))
.height(Length::Fill);
widget::row!(text, icon)
.padding(4)
.spacing(4)
.apply(widget::button)
.style(theme::Button::Primary)
.on_press(HeaderEvent::ToggleSidebar)
.apply(widget::container)
.center_y()
.height(Length::Fill)
.into()
};
let content = widget::container(widget::text(&self.title))
.center_x()
.center_y()
.width(Length::Fill)
.height(Length::Fill)
.into();
let window_controls = {
let mut widgets: Vec<Element<HeaderEvent, _>> = Vec::with_capacity(3);
let icon = |name, size, on_press| {
super::icon(name, size)
.apply(widget::button)
.style(theme::Button::Primary)
.on_press(on_press)
};
if self.show_minimize {
widgets.push(
icon("window-minimize-symbolic", 16, HeaderEvent::Minimize).into()
);
}
if self.show_maximize {
widgets.push(
icon("window-maximize-symbolic", 16, HeaderEvent::Maximize).into()
);
}
widgets.push(
icon("window-close-symbolic", 16, HeaderEvent::Close).into()
);
widget::row(widgets)
.spacing(8)
.apply(widget::container)
.height(Length::Fill)
.center_y()
.into()
};
widget::row(vec![nav_button, content, window_controls])
.height(Length::Units(50))
.padding(10)
.apply(widget::event_container)
.center_y()
.on_press(HeaderEvent::Drag)
.into()
}
}
impl<'a, Message: Clone + 'a> From<HeaderBar<Message>> for Element<'a, Message>
{
fn from(header_bar: HeaderBar<Message>) -> Self {
iced_lazy::component(header_bar)
}
}

100
src/widget/headerbar.rs
View file

@ -1,100 +0,0 @@
use apply::Apply;
use iced::{self, alignment::Vertical, Element, Length, theme, widget};
use crate::WindowMsg;
#[derive(Default)]
pub struct HeaderBar {
pub title: String,
pub nav_title: String,
pub sidebar_active: bool,
pub show_minimize: bool,
pub show_maximize: bool,
}
impl HeaderBar {
pub fn render<T>(&self) -> Element<'_, T>
where T: Clone + From<WindowMsg> + 'static
{
let navbutton = {
let text = widget::text(&self.nav_title)
.vertical_alignment(Vertical::Center)
.width(Length::Shrink)
.height(Length::Fill);
let icon = super::icon(
if self.sidebar_active {
"go-previous-symbolic"
} else {
"go-next-symbolic"
},
24,
)
.width(Length::Units(24))
.height(Length::Fill);
widget::row!(text, icon)
.padding(4)
.spacing(4)
.apply(widget::button)
.on_press(T::from(WindowMsg::ToggleSidebar))
.apply(widget::container)
.center_y()
.height(Length::Fill)
.into()
};
let content = widget::container(widget::text(&self.title))
.center_x()
.center_y()
.width(Length::Fill)
.height(Length::Fill)
.into();
let window_controls = {
let mut widgets: Vec<Element<'_, T>> = Vec::with_capacity(3);
if self.show_minimize {
widgets.push(
super::icon("window-minimize-symbolic", 16)
.apply(widget::button)
.on_press(T::from(WindowMsg::Minimize))
.style(theme::Button::Primary)
.into(),
);
}
if self.show_maximize {
widgets.push(
super::icon("window-maximize-symbolic", 16)
.apply(widget::button)
.on_press(T::from(WindowMsg::Maximize))
.style(crate::iced::theme::Button::Primary)
.into(),
);
}
widgets.push(
super::icon("window-close-symbolic", 16)
.apply(widget::button)
.on_press(T::from(WindowMsg::Close))
.style(crate::iced::theme::Button::Primary)
.into(),
);
widget::row(widgets)
.spacing(8)
.apply(widget::container)
.height(Length::Fill)
.center_y()
.into()
};
widget::row(vec![navbutton, content, window_controls])
.height(Length::Units(50))
.padding(8)
.apply(widget::event_container)
.center_y()
.on_press(T::from(WindowMsg::Drag))
.into()
}
}

4
src/widget/mod.rs
View file

@ -1,8 +1,8 @@
mod button;
pub use button::*;
mod headerbar;
pub use headerbar::*;
mod header_bar;
pub use header_bar::*;
mod icon;
pub use self::icon::*;