This commit is contained in:
wiiznokes 2024-01-04 22:12:43 +01:00 committed by Jeremy Soller
parent 47858bf0aa
commit 1bd39b17ae

View file

@ -168,10 +168,7 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
/// Creates the widget for window controls. /// Creates the widget for window controls.
fn window_controls(&mut self) -> Element<'a, Message> { fn window_controls(&mut self) -> Element<'a, Message> {
let icon = |icon_bytes, size, on_press| { let icon = |icon_bytes, size, on_press| {
widget::icon::from_svg_bytes(icon_bytes)
widget::icon::from_svg_bytes(
icon_bytes,
)
.symbolic(true) .symbolic(true)
.apply(widget::button::icon) .apply(widget::button::icon)
.icon_size(size) .icon_size(size)
@ -179,21 +176,27 @@ impl<'a, Message: Clone + 'static> HeaderBar<'a, Message> {
}; };
widget::row::with_capacity(3) widget::row::with_capacity(3)
.push_maybe( .push_maybe(self.on_minimize.take().map(|m| {
self.on_minimize icon(
.take() &include_bytes!("../../res/icons/window-minimize-symbolic.svg")[..],
.map(|m| icon(&include_bytes!("../../res/icons/window-minimize-symbolic.svg")[..], 16, m)), 16,
) m,
.push_maybe( )
self.on_maximize }))
.take() .push_maybe(self.on_maximize.take().map(|m| {
.map(|m| icon(&include_bytes!("../../res/icons/window-maximize-symbolic.svg")[..], 16, m)), icon(
) &include_bytes!("../../res/icons/window-maximize-symbolic.svg")[..],
.push_maybe( 16,
self.on_close m,
.take() )
.map(|m| icon(&include_bytes!("../../res/icons/window-close-symbolic.svg")[..], 16, m)), }))
) .push_maybe(self.on_close.take().map(|m| {
icon(
&include_bytes!("../../res/icons/window-close-symbolic.svg")[..],
16,
m,
)
}))
.spacing(8) .spacing(8)
.apply(widget::container) .apply(widget::container)
.height(Length::Fill) .height(Length::Fill)