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

refactor: use cctk

Browse source
This commit is contained in:
Ashley Wulber 2024-11-23 02:02:52 -05:00
parent 1b8a399ebd
commit 6e91eabf4c
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
46 changed files with 224 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/sctk_drag/Cargo.toml
View file

@ -16,4 +16,4 @@ iced = { path = "../..", default-features = false, features = [
] }
env_logger = "0.10"
# sctk = { package = "smithay-client-toolkit", path = "../../../fork/client-toolkit/" }
sctk.workspace = true
cctk.workspace = true

3
examples/sctk_subsurface/Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "828b1eb" }
# sctk = { package = "smithay-client-toolkit", git = "https://github.com/smithay/client-toolkit", rev = "828b1eb" }
iced = { path = "../..", default-features = false, features = [
"tokio",
"wayland",
@ -17,3 +17,4 @@ env_logger = "0.10"
futures-channel = "0.3.29"
calloop = "0.12.3"
rustix = { version = "0.38.30", features = ["fs", "shm"] }
cctk.workspace = true

2
examples/sctk_subsurface/src/main.rs
View file

@ -7,7 +7,7 @@ use iced::{
window::{self, Id, Settings},
Element, Length, Subscription, Task,
};
use sctk::reexports::client::{Connection, Proxy};
use cctk::sctk::reexports::client::{Connection, Proxy};
mod wayland;

4
examples/sctk_subsurface/src/wayland.rs
View file

@ -5,7 +5,7 @@ use iced::{
};
use iced_runtime::futures::subscription;
use rustix::{io::Errno, shm::ShmOFlags};
use sctk::{
use cctk::sctk::{
reexports::{
calloop_wayland_source::WaylandSource,
client::{
@ -40,7 +40,7 @@ impl ProvidesRegistryState for AppData {
&mut self.registry_state
}
sctk::registry_handlers!();
cctk::sctk::registry_handlers!();
}
impl ShmHandler for AppData {

2
examples/sctk_todos/Cargo.toml
View file

@ -22,7 +22,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
iced_core.workspace = true
once_cell = "1.15"
sctk.workspace = true
cctk.workspace = true
log = "0.4.17"
env_logger = "0.10.0"
async-std = "1.0"

2
examples/sctk_todos/src/main.rs
View file

@ -96,7 +96,7 @@ impl Todos {
get_layer_surface(iced::platform_specific::runtime::wayland::layer_surface::SctkLayerSurfaceSettings {
size: Some((None, Some(500))),
pointer_interactivity: true,
keyboard_interactivity: sctk::shell::wlr_layer::KeyboardInteractivity::OnDemand,
keyboard_interactivity: cctk::sctk::shell::wlr_layer::KeyboardInteractivity::OnDemand,
anchor: Anchor::LEFT.union(Anchor::RIGHT).union(Anchor::TOP),
..Default::default()
}),