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

wip: applet fixes

Browse source
This commit is contained in:
Ashley Wulber 2022-12-07 11:02:30 -05:00
parent 200784b6c1
commit 80cc66f18a
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
2 changed files with 115 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -7,7 +7,7 @@ edition = "2021"
name = "cosmic" name = "cosmic"
[features] [features]
default = ["wayland"] default = ["wayland", "applet"]
debug = ["iced/debug"] debug = ["iced/debug"]
wayland = ["iced/wayland"] wayland = ["iced/wayland"]
wgpu = ["iced/wgpu"] wgpu = ["iced/wgpu"]

230
src/applet/mod.rs
View file

@ -1,130 +1,128 @@
use cosmic_panel_config::{PanelAnchor, PanelSize}; use cosmic_panel_config::{PanelAnchor, PanelSize};
use iced::{ use iced::{
alignment::{Horizontal, Vertical}, alignment::{Horizontal, Vertical},
widget::{self, Button}, widget::{self, container, Container},
Color, Element, Length, Rectangle, Color, Element, Length, Rectangle,
}; };
use iced_native::command::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}; use iced_native::{command::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}, widget::Button};
use iced_style::container::Appearance; use iced_style::container::{Appearance};
use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity}; use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
use crate::{ use crate::{Renderer, Theme};
button,
theme::{self, Container},
widget::icon,
};
pub fn icon_button<'a, M: 'a, Renderer>( #[derive(Debug, Clone)]
name: &str, pub struct CosmicAppletHelper {
icon_style: <Renderer::Theme as iced_native::svg::StyleSheet>::Style, pub size: PanelSize,
) -> Button<'a, M, Renderer> pub anchor: PanelAnchor,
where
Renderer::Theme: iced_native::svg::StyleSheet + iced_style::button::StyleSheet,
Renderer: iced_native::Renderer + iced_native::svg::Renderer + 'a,
{
let pixels = std::env::var("COSMIC_PANEL_SIZE")
.ok()
.and_then(|size| match size.parse::<PanelSize>() {
Ok(PanelSize::XL) => Some(64),
Ok(PanelSize::L) => Some(36),
Ok(PanelSize::M) => Some(24),
Ok(PanelSize::S) => Some(16),
Ok(PanelSize::XS) => Some(12),
Err(_) => Some(12),
})
.unwrap_or(16);
button!(icon(name, pixels).style(icon_style))
} }
pub fn get_popup_settings( impl Default for CosmicAppletHelper {
parent: iced_native::window::Id, fn default() -> Self {
id: iced_native::window::Id, Self {
size: (u32, u32), size: std::env::var("COSMIC_PANEL_SIZE")
width_padding: Option<i32>, .ok()
height_padding: Option<i32>, .and_then(|size| size.parse::<PanelSize>().ok())
) -> SctkPopupSettings { .unwrap_or(PanelSize::S),
let anchor = std::env::var("COSMIC_PANEL_ANCHOR") anchor: std::env::var("COSMIC_PANEL_SIZE")
.ok() .ok()
.map(|size| match size.parse::<PanelAnchor>() { .and_then(|size| size.parse::<PanelAnchor>().ok())
Ok(p) => p, .unwrap_or(PanelAnchor::Top),
Err(_) => PanelAnchor::Top, }
})
.unwrap_or(PanelAnchor::Top);
let pixels = std::env::var("COSMIC_PANEL_SIZE")
.ok()
.and_then(|size| match size.parse::<PanelSize>() {
Ok(PanelSize::XL) => Some(64),
Ok(PanelSize::L) => Some(36),
Ok(PanelSize::M) => Some(24),
Ok(PanelSize::S) => Some(16),
Ok(PanelSize::XS) => Some(12),
Err(_) => Some(12),
})
.unwrap_or(16);
let (offset, anchor, gravity) = match anchor {
PanelAnchor::Left => ((8, 0), Anchor::Right, Gravity::Right),
PanelAnchor::Right => ((-8, 0), Anchor::Left, Gravity::Left),
PanelAnchor::Top => ((0, 8), Anchor::Bottom, Gravity::Bottom),
PanelAnchor::Bottom => ((0, -8), Anchor::Top, Gravity::Top),
};
SctkPopupSettings {
parent,
id,
positioner: SctkPositioner {
anchor,
gravity,
offset,
size,
anchor_rect: Rectangle {
x: 0,
y: 0,
width: width_padding.unwrap_or(16) * 2 + pixels as i32,
height: height_padding.unwrap_or(8) * 2 + pixels as i32,
},
reactive: true,
constraint_adjustment: 15, // slide_y, slide_x, flip_x, flip_y
..Default::default()
},
parent_size: None,
grab: true,
} }
} }
// TODO popup container which tracks the size of itself and requests the popup to resize to match // pub fn icon_button<'a, M: 'a, Renderer>(
pub fn popup_container<'a, Message, Renderer>( // name: &str,
content: impl Into<Element<'a, Message, Renderer>>,
) -> crate::widget::widget::Container<'a, Message, Renderer> // icon_style: <Renderer::Theme as iced_native::svg::StyleSheet>::Style,
where // ) -> Button<'a, M, Renderer>
Renderer: iced_native::Renderer + 'a, // where
Message: 'a, // Renderer::Theme: iced_native::svg::StyleSheet + iced_style::button::StyleSheet,
<<Renderer as iced_native::Renderer>::Theme as iced_style::container::StyleSheet>::Style: // Renderer: iced_native::Renderer + iced_native::svg::Renderer + 'a,
From<theme::Container>, // {
Renderer::Theme: widget::container::StyleSheet, // button(icon_style).icon(name, pixels).style(icon_style))
{ // }
let anchor = std::env::var("COSMIC_PANEL_ANCHOR")
.ok() impl CosmicAppletHelper {
.map(|size| match size.parse::<PanelAnchor>() { pub fn suggested_icon_size(&self) -> u16 {
Ok(p) => p, match self.size {
Err(_) => PanelAnchor::Top, PanelSize::XL => 64,
}) PanelSize::L => 36,
.unwrap_or(PanelAnchor::Top); PanelSize::M => 24,
let (valign, halign) = match anchor { PanelSize::S => 16,
PanelAnchor::Left => (Vertical::Center, Horizontal::Left), PanelSize::XS => 12,
PanelAnchor::Right => (Vertical::Center, Horizontal::Right), }
PanelAnchor::Top => (Vertical::Top, Horizontal::Center), }
PanelAnchor::Bottom => (Vertical::Bottom, Horizontal::Center),
};
crate::widget::widget::container(crate::widget::widget::container(content).style( pub fn icon_button<Message: 'static>(&self, icon_name: &'static str) -> widget::Button<'static, Message, Renderer> {
Container::Custom(|theme| Appearance { crate::widget::button(crate::theme::Button::Text).icon(crate::theme::Svg::Symbolic, icon_name, self.suggested_icon_size())
text_color: Some(theme.cosmic().on_bg_color().into()), }
background: Some(theme.extended_palette().background.base.color.into()),
border_radius: 12.0, // TODO popup container which tracks the size of itself and requests the popup to resize to match
border_width: 0.0, pub fn popup_container<Message: 'static>(
border_color: Color::TRANSPARENT, &self,
}), content: impl Into<Element<'static, Message, Renderer>>,
)) ) -> Container<Message, Renderer>
.width(Length::Fill) {
.height(Length::Fill) let (valign, halign) = match self.anchor {
.align_x(halign) PanelAnchor::Left => (Vertical::Center, Horizontal::Left),
.align_y(valign) PanelAnchor::Right => (Vertical::Center, Horizontal::Right),
PanelAnchor::Top => (Vertical::Top, Horizontal::Center),
PanelAnchor::Bottom => (Vertical::Bottom, Horizontal::Center),
};
Container::<Message, Renderer>::new(
Container::<Message, Renderer>::new(content).style(crate::theme::Container::Custom(|theme| Appearance {
text_color: Some(theme.cosmic().on_bg_color().into()),
background: Some(theme.extended_palette().background.base.color.into()),
border_radius: 12.0,
border_width: 0.0,
border_color: Color::TRANSPARENT,
})),
)
.width(Length::Fill)
.height(Length::Fill)
.align_x(halign)
.align_y(valign)
}
pub fn get_popup_settings(
&self,
parent: iced_native::window::Id,
id: iced_native::window::Id,
size: (u32, u32),
width_padding: Option<i32>,
height_padding: Option<i32>,
) -> SctkPopupSettings {
let pixels = self.suggested_icon_size();
let (offset, anchor, gravity) = match self.anchor {
PanelAnchor::Left => ((8, 0), Anchor::Right, Gravity::Right),
PanelAnchor::Right => ((-8, 0), Anchor::Left, Gravity::Left),
PanelAnchor::Top => ((0, 8), Anchor::Bottom, Gravity::Bottom),
PanelAnchor::Bottom => ((0, -8), Anchor::Top, Gravity::Top),
};
SctkPopupSettings {
parent,
id,
positioner: SctkPositioner {
anchor,
gravity,
offset,
size,
anchor_rect: Rectangle {
x: 0,
y: 0,
width: width_padding.unwrap_or(16) * 2 + pixels as i32,
height: height_padding.unwrap_or(8) * 2 + pixels as i32,
},
reactive: true,
constraint_adjustment: 15, // slide_y, slide_x, flip_x, flip_y
..Default::default()
},
parent_size: None,
grab: true,
}
}
} }