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

fix: use git deps for cctk

Browse source
This commit is contained in:
Ashley Wulber 2022-12-16 09:52:18 -05:00 • committed by Ashley Wulber
parent 782289f377
commit f904c59436
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -413,6 +413,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-client-toolkit" name = "cosmic-client-toolkit"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols#77738cba2335c5029da797e8683686e041d84bb8"
dependencies = [ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"gl_generator", "gl_generator",
@ -438,6 +439,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-protocols" name = "cosmic-protocols"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols#77738cba2335c5029da797e8683686e041d84bb8"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"wayland-backend", "wayland-backend",

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

@ -5,12 +5,9 @@ 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 = {path = "../../../cosmic-protocols/client-toolkit", 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"] }
cosmic-protocols = { path = "../../../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"] }
# libcosmic = { path = "../../../libcosmic", default-features = false, features = ["wayland", "applet"] }
ron = "0.8" ron = "0.8"
futures = "0.3" futures = "0.3"
futures-util = "0.3" futures-util = "0.3"

14
applets/cosmic-app-list/src/toplevel_handler.rs
View file

@ -8,9 +8,12 @@ use cctk::{
}, },
toplevel_info::{ToplevelInfoHandler, ToplevelInfoState}, toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},
toplevel_management::{ToplevelManagerHandler, ToplevelManagerState}, toplevel_management::{ToplevelManagerHandler, ToplevelManagerState},
wayland_client, wayland_client::{self, WEnum},
};
use cosmic_protocols::{
toplevel_info::v1::client::zcosmic_toplevel_handle_v1,
toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
}; };
use cosmic_protocols::toplevel_info::v1::client::zcosmic_toplevel_handle_v1;
use futures::channel::mpsc::UnboundedSender; use futures::channel::mpsc::UnboundedSender;
use sctk::registry::{ProvidesRegistryState, RegistryState}; use sctk::registry::{ProvidesRegistryState, RegistryState};
use wayland_client::{globals::registry_queue_init, Connection, QueueHandle}; use wayland_client::{globals::registry_queue_init, Connection, QueueHandle};
@ -65,7 +68,12 @@ impl ToplevelManagerHandler for AppData {
&mut self.toplevel_manager_state &mut self.toplevel_manager_state
} }
fn capabilities(&mut self, _: &Connection, _: &QueueHandle<Self>, _: Vec<u8>) { fn capabilities(
&mut self,
_: &Connection,
_: &QueueHandle<Self>,
_: Vec<WEnum<zcosmic_toplevel_manager_v1::ZcosmicToplelevelManagementCapabilitiesV1>>,
) {
// TODO capabilities could affect the options in the applet // TODO capabilities could affect the options in the applet
} }
} }