leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: update libcosmic and remove resize option from workspaces window builder

Browse source
This commit is contained in:
Ashley Wulber 2023-06-16 20:37:02 -04:00 • committed by Ashley Wulber
parent 5a15ef8d7f
commit 93385bc42c
4 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Cargo.lock generated
View file

@ -763,6 +763,7 @@ dependencies = [
"libcosmic", "libcosmic",
"once_cell", "once_cell",
"rust-embed", "rust-embed",
"tracing",
"zbus", "zbus",
] ]
@ -867,7 +868,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -881,7 +882,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -958,7 +959,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config",
@ -981,9 +982,9 @@ dependencies = [
[[package]] [[package]]
name = "cpufeatures" name = "cpufeatures"
version = "0.2.7" version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -2251,7 +2252,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2266,7 +2267,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_unix", "accesskit_unix",
@ -2275,7 +2276,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"iced_accessibility", "iced_accessibility",
@ -2290,7 +2291,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2303,7 +2304,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2320,7 +2321,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2332,7 +2333,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2344,7 +2345,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_sctk" name = "iced_sctk"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"enum-repr", "enum-repr",
"float-cmp", "float-cmp",
@ -2366,7 +2367,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2376,7 +2377,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2394,7 +2395,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2415,7 +2416,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"iced_renderer", "iced_renderer",
"iced_runtime", "iced_runtime",
@ -2663,7 +2664,7 @@ checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#bf456a08ee81aaebcbcea87d94079c87dc032e28" source = "git+https://github.com/pop-os/libcosmic/#ce685b5aebabafafedf3480b1a41a68c3afd34ec"
dependencies = [ dependencies = [
"apply", "apply",
"cosmic-config", "cosmic-config",
@ -3027,9 +3028,9 @@ dependencies = [
[[package]] [[package]]
name = "notify" name = "notify"
version = "6.0.0" version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d9ba6c734de18ca27c8cef5cd7058aa4ac9f63596131e4c7e41e579319032a2" checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"crossbeam-channel", "crossbeam-channel",
@ -3937,9 +3938,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.96" version = "1.0.97"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a"
dependencies = [ dependencies = [
"itoa", "itoa",
"ryu", "ryu",

1
cosmic-applet-graphics/Cargo.toml
View file

@ -14,3 +14,4 @@ once_cell = "1"
i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.13.4", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6.4" i18n-embed-fl = "0.6.4"
rust-embed = "6.3.0" rust-embed = "6.3.0"
tracing = "0.1"

2
cosmic-applet-graphics/src/window.rs
View file

@ -179,7 +179,7 @@ impl Application for Window {
Message::CurrentGraphics(match cur_graphics { Message::CurrentGraphics(match cur_graphics {
Ok(g) => Some(g), Ok(g) => Some(g),
Err(err) => { Err(err) => {
dbg!(err); tracing::error!("{:?}", err);
None None
} }
}) })

24
cosmic-applet-workspaces/src/components/app.rs
View file

@ -26,6 +26,8 @@ pub fn run() -> cosmic::iced::Result {
let settings = Settings { let settings = Settings {
initial_surface: InitialSurface::XdgWindow(SctkWindowSettings { initial_surface: InitialSurface::XdgWindow(SctkWindowSettings {
size: (32, 32), size: (32, 32),
autosize: true,
resizable: None,
..Default::default() ..Default::default()
}), }),
..Default::default() ..Default::default()
@ -96,12 +98,6 @@ impl Application for IcedWorkspacesApplet {
Ordering::Greater => Ordering::Greater, Ordering::Greater => Ordering::Greater,
}); });
self.workspaces = list; self.workspaces = list;
let unit = self.helper.suggested_size().0 as u32 + 16;
let (w, h) = match self.layout {
Layout::Row => (unit * self.workspaces.len().max(1) as u32, unit),
Layout::Column => (unit, unit * self.workspaces.len().max(1) as u32),
};
return resize_window(window::Id(0), w, h);
} }
WorkspacesUpdate::Started(tx) => { WorkspacesUpdate::Started(tx) => {
self.workspace_tx.replace(tx); self.workspace_tx.replace(tx);
@ -146,8 +142,8 @@ impl Application for IcedWorkspacesApplet {
.width(Length::Fill) .width(Length::Fill)
.height(Length::Fill), .height(Length::Fill),
) )
.width(Length::Fill) .width(Length::Fixed(self.helper.suggested_size().0 as f32 + 16.0))
.height(Length::Fill) .height(Length::Fixed(self.helper.suggested_size().0 as f32 + 16.0))
.on_press(Message::WorkspacePressed(w.2.clone())) .on_press(Message::WorkspacePressed(w.2.clone()))
.padding(0); .padding(0);
Some( Some(
@ -163,20 +159,20 @@ impl Application for IcedWorkspacesApplet {
.collect(); .collect();
let layout_section: Element<_> = match self.layout { let layout_section: Element<_> = match self.layout {
Layout::Row => row(buttons) Layout::Row => row(buttons)
.width(Length::Fill) .width(Length::Shrink)
.height(Length::Fill) .height(Length::Shrink)
.padding(0) .padding(0)
.into(), .into(),
Layout::Column => column(buttons) Layout::Column => column(buttons)
.width(Length::Fill) .width(Length::Shrink)
.height(Length::Fill) .height(Length::Shrink)
.padding(0) .padding(0)
.into(), .into(),
}; };
container(layout_section) container(layout_section)
.width(Length::Fill) .width(Length::Shrink)
.height(Length::Fill) .height(Length::Shrink)
.padding(0) .padding(0)
.into() .into()
} }