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

improv: get window control icons from icon theme

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-07-22 07:23:17 +02:00
parent 5474232796
commit 1e5828e01c
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
6 changed files with 31 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/widget/context_drawer/overlay.rs
View file

@ -8,6 +8,7 @@ use iced::advanced::widget::{self, Operation, OperationOutputWrapper};
use iced::advanced::{overlay, renderer};
use iced::advanced::{Clipboard, Shell};
use iced::{event, mouse, Event, Point, Rectangle, Size};
use iced_core::Renderer;
pub(super) struct Overlay<'a, 'b, Message> {
pub(super) content: &'b mut Element<'a, Message>,
@ -80,15 +81,17 @@ where
layout: Layout<'_>,
cursor: mouse::Cursor,
) {
self.content.as_widget().draw(
self.tree,
renderer,
theme,
style,
layout,
cursor,
&layout.bounds(),
);
renderer.with_layer(layout.bounds(), |renderer| {
self.content.as_widget().draw(
self.tree,
renderer,
theme,
style,
layout,
cursor,
&layout.bounds(),
);
})
}
fn operate(

40
src/widget/header_bar.rs
View file

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

11
src/widget/toaster/mod.rs
View file

@ -46,15 +46,8 @@ where
button::text(&action.description).on_press(action.message.clone())
}))
.push(
button::icon(
//TODO: include this in one place
icon::from_svg_bytes(
&include_bytes!("../../../res/icons/window-close-symbolic.svg")[..],
)
.symbolic(true),
)
.icon_size(16)
.on_press(ToastMessage(toast.id).into()),
button::icon(icon::from_name("window-close-symbolic"))
.on_press(ToastMessage(toast.id).into()),
)
.align_items(iced::Alignment::Center)
.spacing(space_xxs),