fix: Updates & fixes the applets helpers
This commit is contained in:
Ashley Wulber
GitHub
parent
c96c1c3e20
commit
5dbb050d48
1 changed files with 102 additions and 116 deletions
|
|
@ -1,130 +1,116 @@
|
|||
use cosmic_panel_config::{PanelAnchor, PanelSize};
|
||||
use iced::{
|
||||
alignment::{Horizontal, Vertical},
|
||||
widget::{self, Button},
|
||||
widget::{self, container, Container},
|
||||
Color, Element, Length, Rectangle,
|
||||
};
|
||||
use iced_native::command::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner};
|
||||
use iced_style::container::Appearance;
|
||||
use iced_native::{command::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}, widget::Button};
|
||||
use iced_style::container::{Appearance};
|
||||
use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
|
||||
|
||||
use crate::{
|
||||
button,
|
||||
theme::{self, Container},
|
||||
widget::icon,
|
||||
};
|
||||
use crate::{Renderer, Theme};
|
||||
|
||||
pub fn icon_button<'a, M: 'a, Renderer>(
|
||||
name: &str,
|
||||
icon_style: <Renderer::Theme as iced_native::svg::StyleSheet>::Style,
|
||||
) -> Button<'a, M, Renderer>
|
||||
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))
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct CosmicAppletHelper {
|
||||
pub size: PanelSize,
|
||||
pub anchor: PanelAnchor,
|
||||
}
|
||||
|
||||
pub fn get_popup_settings(
|
||||
parent: iced_native::window::Id,
|
||||
id: iced_native::window::Id,
|
||||
size: (u32, u32),
|
||||
width_padding: Option<i32>,
|
||||
height_padding: Option<i32>,
|
||||
) -> SctkPopupSettings {
|
||||
let anchor = std::env::var("COSMIC_PANEL_ANCHOR")
|
||||
.ok()
|
||||
.map(|size| match size.parse::<PanelAnchor>() {
|
||||
Ok(p) => p,
|
||||
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,
|
||||
impl Default for CosmicAppletHelper {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
size: std::env::var("COSMIC_PANEL_SIZE")
|
||||
.ok()
|
||||
.and_then(|size| size.parse::<PanelSize>().ok())
|
||||
.unwrap_or(PanelSize::S),
|
||||
anchor: std::env::var("COSMIC_PANEL_ANCHOR")
|
||||
.ok()
|
||||
.and_then(|size| size.parse::<PanelAnchor>().ok())
|
||||
.unwrap_or(PanelAnchor::Top),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO popup container which tracks the size of itself and requests the popup to resize to match
|
||||
pub fn popup_container<'a, Message, Renderer>(
|
||||
content: impl Into<Element<'a, Message, Renderer>>,
|
||||
) -> crate::widget::widget::Container<'a, Message, Renderer>
|
||||
where
|
||||
Renderer: iced_native::Renderer + 'a,
|
||||
Message: 'a,
|
||||
<<Renderer as iced_native::Renderer>::Theme as iced_style::container::StyleSheet>::Style:
|
||||
From<theme::Container>,
|
||||
Renderer::Theme: widget::container::StyleSheet,
|
||||
{
|
||||
let anchor = std::env::var("COSMIC_PANEL_ANCHOR")
|
||||
.ok()
|
||||
.map(|size| match size.parse::<PanelAnchor>() {
|
||||
Ok(p) => p,
|
||||
Err(_) => PanelAnchor::Top,
|
||||
})
|
||||
.unwrap_or(PanelAnchor::Top);
|
||||
let (valign, halign) = match anchor {
|
||||
PanelAnchor::Left => (Vertical::Center, Horizontal::Left),
|
||||
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(
|
||||
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)
|
||||
impl CosmicAppletHelper {
|
||||
pub fn suggested_icon_size(&self) -> u16 {
|
||||
match self.size {
|
||||
PanelSize::XL => 64,
|
||||
PanelSize::L => 36,
|
||||
PanelSize::M => 24,
|
||||
PanelSize::S => 16,
|
||||
PanelSize::XS => 12,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
pub fn icon_button<'a, Message: 'static>(&self, icon_name: &'a str) -> widget::Button<'a, Message, Renderer> {
|
||||
crate::widget::button(crate::theme::Button::Text).icon(crate::theme::Svg::Symbolic, icon_name, self.suggested_icon_size()).padding(8)
|
||||
}
|
||||
|
||||
// TODO popup container which tracks the size of itself and requests the popup to resize to match
|
||||
pub fn popup_container<'a, Message: 'static>(
|
||||
&self,
|
||||
content: impl Into<Element<'a, Message, Renderer>>,
|
||||
) -> Container<'a, Message, Renderer>
|
||||
{
|
||||
let (valign, halign) = match self.anchor {
|
||||
PanelAnchor::Left => (Vertical::Center, Horizontal::Left),
|
||||
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(8) * 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,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue