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

update deps

Browse source
This commit is contained in:
Ashley Wulber 2022-12-21 17:06:53 -05:00 • committed by Ashley Wulber
parent 868a452538
commit 6db4d354e1
3 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

29
applets/cosmic-app-list/Cargo.lock generated
View file

@ -388,7 +388,6 @@ dependencies = [
"anyhow", "anyhow",
"calloop", "calloop",
"cosmic-client-toolkit", "cosmic-client-toolkit",
"cosmic-panel-config",
"cosmic-protocols", "cosmic-protocols",
"freedesktop-desktop-entry", "freedesktop-desktop-entry",
"freedesktop-icons", "freedesktop-icons",
@ -425,7 +424,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#671492242ce64dbec8644d4b51f732a814c994bd" source = "git+https://github.com/pop-os/cosmic-panel?rev=6714922#671492242ce64dbec8644d4b51f732a814c994bd"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ron", "ron",
@ -1466,7 +1465,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -1483,7 +1482,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"palette", "palette",
@ -1493,7 +1492,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"futures", "futures",
"log", "log",
@ -1505,7 +1504,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_glow" name = "iced_glow"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"euclid", "euclid",
@ -1520,7 +1519,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",
@ -1540,7 +1539,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_lazy" name = "iced_lazy"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"iced_native", "iced_native",
"ouroboros 0.13.0", "ouroboros 0.13.0",
@ -1549,7 +1548,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_native" name = "iced_native"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -1563,7 +1562,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/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"enum-repr", "enum-repr",
"futures", "futures",
@ -1582,7 +1581,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -1592,7 +1591,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_swbuf" name = "iced_swbuf"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"cosmic-text", "cosmic-text",
"iced_graphics", "iced_graphics",
@ -1607,7 +1606,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",
@ -1786,7 +1785,7 @@ checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#268cf4eb9f55e4038fe4c69a51092f11802bdf81" source = "git+https://github.com/pop-os/libcosmic/?branch=master#bdf5f7da38379360290e55984d5f7547e518aaa6"
dependencies = [ dependencies = [
"apply", "apply",
"cosmic-panel-config", "cosmic-panel-config",
@ -3033,7 +3032,7 @@ dependencies = [
[[package]] [[package]]
name = "swbuf" name = "swbuf"
version = "0.1.1" version = "0.1.1"
source = "git+https://github.com/rust-windowing/swbuf?branch=main#9b8641fc0700e2e19eb68fda30b7a92772ac0150" source = "git+https://github.com/rust-windowing/swbuf?rev=9b8641fc#9b8641fc0700e2e19eb68fda30b7a92772ac0150"
dependencies = [ dependencies = [
"cocoa", "cocoa",
"core-graphics", "core-graphics",

5
applets/cosmic-app-list/Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
cctk = {git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit"} cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"] } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"] }
libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet", "tokio"] } libcosmic = { git = "https://github.com/pop-os/libcosmic/", branch = "master", default-features = false, features = ["wayland", "applet", "tokio"] }
ron = "0.8" ron = "0.8"
@ -22,9 +22,8 @@ serde = { version = "1.0", features = ["derive"] }
log = "0.4" log = "0.4"
tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] } tokio = { version = "1.17.0", features = ["sync", "rt", "rt-multi-thread", "macros", "process"] }
itertools = "*" itertools = "*"
cosmic-panel-config = {git = "https://github.com/pop-os/cosmic-panel", no-default-features = true}
freedesktop-desktop-entry = "0.5.0" freedesktop-desktop-entry = "0.5.0"
freedesktop-icons = {git = "https://github.com/wash2/freedestkop-icons"} freedesktop-icons = { git = "https://github.com/wash2/freedestkop-icons" }
i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] } i18n-embed = { version = "0.13", features = ["fluent-system", "desktop-requester"] }
i18n-embed-fl = "0.6" i18n-embed-fl = "0.6"
rust-embed = "6.3" rust-embed = "6.3"

12
applets/cosmic-app-list/src/app.rs
View file

@ -11,6 +11,7 @@ use crate::toplevel_subscription::ToplevelUpdate;
use calloop::channel::Sender; use calloop::channel::Sender;
use cctk::toplevel_info::ToplevelInfo; use cctk::toplevel_info::ToplevelInfo;
use cctk::wayland_client::protocol::wl_seat::WlSeat; use cctk::wayland_client::protocol::wl_seat::WlSeat;
use cosmic::applet::cosmic_panel_config::PanelAnchor;
use cosmic::applet::CosmicAppletHelper; use cosmic::applet::CosmicAppletHelper;
use cosmic::iced; use cosmic::iced;
use cosmic::iced::wayland::popup::destroy_popup; use cosmic::iced::wayland::popup::destroy_popup;
@ -29,7 +30,6 @@ use cosmic::widget::rectangle_tracker::RectangleTracker;
use cosmic::widget::rectangle_tracker::RectangleUpdate; use cosmic::widget::rectangle_tracker::RectangleUpdate;
use cosmic::widget::{horizontal_rule, vertical_rule}; use cosmic::widget::{horizontal_rule, vertical_rule};
use cosmic::{Element, Theme}; use cosmic::{Element, Theme};
use cosmic_panel_config::PanelAnchor;
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1; use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1::ZcosmicToplevelHandleV1;
use freedesktop_desktop_entry::DesktopEntry; use freedesktop_desktop_entry::DesktopEntry;
use iced::wayland::window::resize_window; use iced::wayland::window::resize_window;
@ -73,7 +73,7 @@ struct CosmicAppList {
impl CosmicAppList { impl CosmicAppList {
fn window_size(&self) -> (u32, u32) { fn window_size(&self) -> (u32, u32) {
let pixel_size = self.applet_helper.suggested_icon_size(); let pixel_size = self.applet_helper.suggested_size().0;
let padding = 8; let padding = 8;
let dot_size = 4; let dot_size = 4;
let spacing = 4; let spacing = 4;
@ -402,13 +402,13 @@ impl Application for CosmicAppList {
let icon = if desktop_info.icon.extension() == Some(&OsStr::new("svg")) { let icon = if desktop_info.icon.extension() == Some(&OsStr::new("svg")) {
let handle = svg::Handle::from_path(&desktop_info.icon); let handle = svg::Handle::from_path(&desktop_info.icon);
svg::Svg::new(handle) svg::Svg::new(handle)
.width(Length::Units(self.applet_helper.suggested_icon_size())) .width(Length::Units(self.applet_helper.suggested_size().0))
.height(Length::Units(self.applet_helper.suggested_icon_size())) .height(Length::Units(self.applet_helper.suggested_size().0))
.into() .into()
} else { } else {
Image::new(&desktop_info.icon) Image::new(&desktop_info.icon)
.width(Length::Units(self.applet_helper.suggested_icon_size())) .width(Length::Units(self.applet_helper.suggested_size().0))
.height(Length::Units(self.applet_helper.suggested_icon_size())) .height(Length::Units(self.applet_helper.suggested_size().0))
.into() .into()
}; };
let dot_radius = 2; let dot_radius = 2;