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

feat: applet-window-settings

Browse source
This commit is contained in:
Ashley Wulber 2022-12-08 12:55:36 -05:00 • committed by Michael Murphy
parent 5dbb050d48
commit 91e826d8ea
1 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/applet/mod.rs
View file

@ -1,14 +1,16 @@
use cosmic_panel_config::{PanelAnchor, PanelSize}; use cosmic_panel_config::{PanelAnchor, PanelSize};
use iced::{ use iced::{
alignment::{Horizontal, Vertical}, alignment::{Horizontal, Vertical},
widget::{self, container, Container}, widget::{self, Container},
Color, Element, Length, Rectangle, Color, Element, Length, Rectangle, Settings, sctk_settings::InitialSurface,
}; };
use iced_native::{command::platform_specific::wayland::popup::{SctkPopupSettings, SctkPositioner}, widget::Button}; use iced_native::{command::platform_specific::wayland::{popup::{SctkPopupSettings, SctkPositioner}, window::SctkWindowSettings}};
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::{Renderer, Theme}; use crate::{Renderer};
const APPLET_PADDING: u32 = 8;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct CosmicAppletHelper { pub struct CosmicAppletHelper {
@ -42,6 +44,20 @@ impl CosmicAppletHelper {
} }
} }
pub fn window_settings<F: Default>(&self) -> Settings<F> {
let mut settings = crate::settings();
let pixels = self.suggested_icon_size() 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)),
..Default::default()
},
..Default::default()
});
settings
}
pub fn icon_button<'a, Message: 'static>(&self, icon_name: &'a str) -> widget::Button<'a, Message, Renderer> { 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) crate::widget::button(crate::theme::Button::Text).icon(crate::theme::Svg::Symbolic, icon_name, self.suggested_icon_size()).padding(8)
@ -84,11 +100,12 @@ impl CosmicAppletHelper {
height_padding: Option<i32>, height_padding: Option<i32>,
) -> SctkPopupSettings { ) -> SctkPopupSettings {
let pixels = self.suggested_icon_size(); let pixels = self.suggested_icon_size();
let pixel_offset = 8;
let (offset, anchor, gravity) = match self.anchor { let (offset, anchor, gravity) = match self.anchor {
PanelAnchor::Left => ((8, 0), Anchor::Right, Gravity::Right), PanelAnchor::Left => ((pixel_offset, 0), Anchor::Right, Gravity::Right),
PanelAnchor::Right => ((-8, 0), Anchor::Left, Gravity::Left), PanelAnchor::Right => ((-pixel_offset, 0), Anchor::Left, Gravity::Left),
PanelAnchor::Top => ((0, 8), Anchor::Bottom, Gravity::Bottom), PanelAnchor::Top => ((0, pixel_offset), Anchor::Bottom, Gravity::Bottom),
PanelAnchor::Bottom => ((0, -8), Anchor::Top, Gravity::Top), PanelAnchor::Bottom => ((0, -pixel_offset), Anchor::Top, Gravity::Top),
}; };
SctkPopupSettings { SctkPopupSettings {
parent, parent,
@ -101,8 +118,8 @@ impl CosmicAppletHelper {
anchor_rect: Rectangle { anchor_rect: Rectangle {
x: 0, x: 0,
y: 0, y: 0,
width: width_padding.unwrap_or(8) * 2 + pixels as i32, width: width_padding.unwrap_or(APPLET_PADDING as i32) * 2 + pixels as i32,
height: height_padding.unwrap_or(8) * 2 + pixels as i32, height: height_padding.unwrap_or(APPLET_PADDING as i32) * 2 + pixels as i32,
}, },
reactive: true, reactive: true,
constraint_adjustment: 15, // slide_y, slide_x, flip_x, flip_y constraint_adjustment: 15, // slide_y, slide_x, flip_x, flip_y
@ -113,4 +130,3 @@ impl CosmicAppletHelper {
} }
} }
} }