chore: update dependencies
This commit is contained in:
parent
db6fbfbce7
commit
5fbbf4ba37
5 changed files with 845 additions and 653 deletions
1435
Cargo.lock
generated
1435
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
36
Cargo.toml
36
Cargo.toml
|
|
@ -1,16 +1,15 @@
|
||||||
[package]
|
[package]
|
||||||
name = "cosmic-workspaces"
|
name = "cosmic-workspaces"
|
||||||
version = "0.1.0"
|
version = "1.0.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0.99"
|
anyhow = "1.0.102"
|
||||||
calloop = { version = "0.14.3", features = ["executor"] }
|
calloop = { version = "0.14.4", features = ["executor"] }
|
||||||
clap = { version = "4", features = ["derive"] }
|
clap = { version = "4", features = ["derive"] }
|
||||||
cosmic-bg-config = { git = "https://github.com/pop-os/cosmic-bg" }
|
cosmic-bg-config = { git = "https://github.com/pop-os/cosmic-bg" }
|
||||||
cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp", branch = "action-on-typing" }
|
cosmic-comp-config = { git = "https://github.com/pop-os/cosmic-comp" }
|
||||||
env_logger = "0.11.8"
|
env_logger = "0.11.9"
|
||||||
futures-channel = "0.3.31"
|
|
||||||
gbm = "0.18.0"
|
gbm = "0.18.0"
|
||||||
libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [
|
libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = [
|
||||||
"tokio",
|
"tokio",
|
||||||
|
|
@ -23,22 +22,21 @@ libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = fa
|
||||||
cosmic-config = { git = "https://github.com/pop-os/libcosmic" }
|
cosmic-config = { git = "https://github.com/pop-os/libcosmic" }
|
||||||
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
|
freedesktop-icons = { package = "cosmic-freedesktop-icons", git = "https://github.com/pop-os/freedesktop-icons" }
|
||||||
|
|
||||||
memmap2 = "0.9.8"
|
memmap2 = "0.9.10"
|
||||||
tokio = "1.47.1"
|
tokio = "1.49.0"
|
||||||
wayland-protocols = "0.32.9"
|
wayland-protocols = "0.32.10"
|
||||||
delegate = "0.13.4"
|
delegate = "0.13.5"
|
||||||
itertools = "0.14.0"
|
itertools = "0.14.0"
|
||||||
log = "0.4.28"
|
log = "0.4.29"
|
||||||
i18n-embed-fl = "0.10"
|
i18n-embed-fl = "0.10"
|
||||||
rust-embed = "8.7.2"
|
rust-embed = "8.11.0"
|
||||||
rustix = { version = "1.1.2", features = ["fs", "shm"] }
|
rustix = { version = "1.1.3", features = ["fs", "shm"] }
|
||||||
calloop-wayland-source = "0.4.1"
|
calloop-wayland-source = "0.4.1"
|
||||||
aliasable = "0.1.3"
|
aliasable = "0.1.3"
|
||||||
futures-executor = { version = "0.3.31", features = ["thread-pool"] }
|
zbus = "5.13.2"
|
||||||
zbus = "5.9.0"
|
tokio-stream = { version = "0.1.18", features = ["sync"] }
|
||||||
tokio-stream = { version = "0.1.17", features = ["sync"] }
|
|
||||||
ash = { version = "0.38.0", features = ["loaded"] }
|
ash = { version = "0.38.0", features = ["loaded"] }
|
||||||
bytemuck = "1.23.2"
|
bytemuck = "1.25.0"
|
||||||
cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" }
|
cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" }
|
||||||
|
|
||||||
[dependencies.i18n-embed]
|
[dependencies.i18n-embed]
|
||||||
|
|
@ -56,7 +54,3 @@ mock-backend = []
|
||||||
[profile.dev]
|
[profile.dev]
|
||||||
# Not usable at opt-level 0, at least with software renderer
|
# Not usable at opt-level 0, at least with software renderer
|
||||||
opt-level = 1
|
opt-level = 1
|
||||||
|
|
||||||
[patch."https://github.com/pop-os/cosmic-protocols"]
|
|
||||||
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", branch = "main" }
|
|
||||||
cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", branch = "main" }
|
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,13 @@ use cosmic::{
|
||||||
cctk,
|
cctk,
|
||||||
iced::{
|
iced::{
|
||||||
self,
|
self,
|
||||||
futures::{FutureExt, SinkExt, executor::block_on},
|
futures::{
|
||||||
|
FutureExt, SinkExt,
|
||||||
|
channel::mpsc,
|
||||||
|
executor::{ThreadPool, block_on},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use futures_channel::mpsc;
|
|
||||||
use std::{cell::RefCell, collections::HashMap, sync::Arc, thread};
|
use std::{cell::RefCell, collections::HashMap, sync::Arc, thread};
|
||||||
|
|
||||||
mod buffer;
|
mod buffer;
|
||||||
|
|
@ -63,7 +66,7 @@ pub struct AppData {
|
||||||
captures: RefCell<HashMap<CaptureSource, Arc<Capture>>>,
|
captures: RefCell<HashMap<CaptureSource, Arc<Capture>>>,
|
||||||
dmabuf_feedback: Option<DmabufFeedback>,
|
dmabuf_feedback: Option<DmabufFeedback>,
|
||||||
gbm_devices: GbmDevices,
|
gbm_devices: GbmDevices,
|
||||||
thread_pool: futures_executor::ThreadPool,
|
thread_pool: ThreadPool,
|
||||||
vulkan: Option<vulkan::Vulkan>,
|
vulkan: Option<vulkan::Vulkan>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -278,10 +281,7 @@ fn start(conn: Connection) -> mpsc::Receiver<Event> {
|
||||||
thread::spawn(move || {
|
thread::spawn(move || {
|
||||||
// TODO: The `calloop` executor doesn't seem to be working properly, so
|
// TODO: The `calloop` executor doesn't seem to be working properly, so
|
||||||
// spawn an executor using one additional thread.
|
// spawn an executor using one additional thread.
|
||||||
let thread_pool = futures_executor::ThreadPool::builder()
|
let thread_pool = ThreadPool::builder().pool_size(1).create().unwrap();
|
||||||
.pool_size(1)
|
|
||||||
.create()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let registry_state = RegistryState::new(&globals);
|
let registry_state = RegistryState::new(&globals);
|
||||||
let mut app_data = AppData {
|
let mut app_data = AppData {
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ use cosmic::{
|
||||||
self,
|
self,
|
||||||
screencopy::{
|
screencopy::{
|
||||||
CaptureFrame, CaptureOptions, CaptureSession, CaptureSource, FailureReason, Formats,
|
CaptureFrame, CaptureOptions, CaptureSession, CaptureSource, FailureReason, Formats,
|
||||||
Frame, Rect, ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler,
|
Frame, ScreencopyFrameData, ScreencopyFrameDataExt, ScreencopyHandler,
|
||||||
ScreencopySessionData, ScreencopySessionDataExt, ScreencopyState,
|
ScreencopySessionData, ScreencopySessionDataExt, ScreencopyState,
|
||||||
},
|
},
|
||||||
wayland_client::{Connection, QueueHandle, WEnum},
|
wayland_client::{Connection, QueueHandle, WEnum},
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ use cosmic::{
|
||||||
widget::{self, Widget},
|
widget::{self, Widget},
|
||||||
};
|
};
|
||||||
use cosmic_comp_config::workspace::WorkspaceLayout;
|
use cosmic_comp_config::workspace::WorkspaceLayout;
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::HashSet;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
App, LayerSurface, Msg, Toplevel, Workspace,
|
App, LayerSurface, Msg, Toplevel, Workspace,
|
||||||
|
|
@ -287,12 +287,9 @@ fn workspace_item(
|
||||||
|
|
||||||
let workspace_footer = row![
|
let workspace_footer = row![
|
||||||
widget::horizontal_space().width(Length::Fixed(32.0)),
|
widget::horizontal_space().width(Length::Fixed(32.0)),
|
||||||
widget::text::body(fl!(
|
widget::text::body(fl!("workspace", number = workspace.info.name.as_str()))
|
||||||
"workspace",
|
.apply(widget::container)
|
||||||
HashMap::from([("number", &workspace.info.name)])
|
.center_x(Length::Fill),
|
||||||
))
|
|
||||||
.apply(widget::container)
|
|
||||||
.center_x(Length::Fill),
|
|
||||||
pin_button(workspace),
|
pin_button(workspace),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue