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

CosmicAppletHelper: Add window size helper

Browse source
This commit is contained in:
13r0ck 2022-12-20 17:12:03 -07:00 • committed by Jeremy Soller
parent 906711b916
commit c46207a993
1 changed files with 65 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

99
src/applet/mod.rs
View file

@ -1,30 +1,43 @@
use cosmic_panel_config::{PanelAnchor, PanelSize};
use iced::{
alignment::{Horizontal, Vertical},
sctk_settings::InitialSurface,
widget::{self, Container},
Color, Element, Length, Rectangle, Settings, sctk_settings::InitialSurface,
Color, Element, Length, Rectangle, Settings,
};
use iced_native::{command::platform_specific::wayland::{popup::{SctkPopupSettings, SctkPositioner}, window::SctkWindowSettings}};
use iced_style::container::{Appearance};
use iced_native::command::platform_specific::wayland::{
popup::{SctkPopupSettings, SctkPositioner},
window::SctkWindowSettings,
};
use iced_style::container::Appearance;
use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
use crate::{Renderer};
use crate::Renderer;
const APPLET_PADDING: u32 = 8;
#[derive(Debug, Clone)]
pub struct CosmicAppletHelper {
pub size: PanelSize,
pub size: Size,
pub anchor: PanelAnchor,
}
#[derive(Clone, Debug)]
pub enum Size {
PanelSize(PanelSize),
// (width, height)
Hardcoded((u16, u16)),
}
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),
size: Size::PanelSize(
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())
@ -34,24 +47,34 @@ impl Default for CosmicAppletHelper {
}
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 suggested_size(&self) -> (u16, u16) {
match &self.size {
Size::PanelSize(size) => match size {
PanelSize::XL => (64, 64),
PanelSize::L => (36, 36),
PanelSize::M => (24, 24),
PanelSize::S => (16, 16),
PanelSize::XS => (12, 12),
},
Size::Hardcoded((width, height)) => (*width, *height),
}
}
// Set the default window size. Helper for application init with hardcoded size.
pub fn window_size(&mut self, width: u16, height: u16) {
self.size = Size::Hardcoded((width, height));
}
pub fn window_settings<F: Default>(&self) -> Settings<F> {
let mut settings = crate::settings();
let pixels = self.suggested_icon_size() as u32;
let (width, height) = self.suggested_size();
let width = width as u32;
let height = height as u32;
settings.initial_surface = InitialSurface::XdgWindow(SctkWindowSettings {
iced_settings: iced_native::window::Settings {
size: (pixels + APPLET_PADDING * 2, pixels + APPLET_PADDING * 2),
min_size: Some((pixels + APPLET_PADDING * 2, pixels + APPLET_PADDING * 2)),
max_size: Some((pixels + APPLET_PADDING * 2, pixels + APPLET_PADDING * 2)),
size: (width + APPLET_PADDING * 2, height + APPLET_PADDING * 2),
min_size: Some((width + APPLET_PADDING * 2, height + APPLET_PADDING * 2)),
max_size: Some((width + APPLET_PADDING * 2, height + APPLET_PADDING * 2)),
..Default::default()
},
..Default::default()
@ -59,32 +82,40 @@ impl CosmicAppletHelper {
settings
}
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)
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_size().0,
)
.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>
{
) -> 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 {
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)
@ -99,7 +130,7 @@ impl CosmicAppletHelper {
width_padding: Option<i32>,
height_padding: Option<i32>,
) -> SctkPopupSettings {
let pixels = self.suggested_icon_size();
let (width, height) = self.suggested_size();
let pixel_offset = 8;
let (offset, anchor, gravity) = match self.anchor {
PanelAnchor::Left => ((pixel_offset, 0), Anchor::Right, Gravity::Right),
@ -118,8 +149,8 @@ impl CosmicAppletHelper {
anchor_rect: Rectangle {
x: 0,
y: 0,
width: width_padding.unwrap_or(APPLET_PADDING as i32) * 2 + pixels as i32,
height: height_padding.unwrap_or(APPLET_PADDING as i32) * 2 + pixels as i32,
width: width_padding.unwrap_or(APPLET_PADDING as i32) * 2 + width as i32,
height: height_padding.unwrap_or(APPLET_PADDING as i32) * 2 + height as i32,
},
reactive: true,
constraint_adjustment: 15, // slide_y, slide_x, flip_x, flip_y
@ -129,4 +160,4 @@ impl CosmicAppletHelper {
grab: true,
}
}
}
}