Compare commits

...
Sign in to create a new pull request.

12 commits

Author SHA1 Message Date
4391e53a8d chore: resolve local graphics dependencies 2026-05-25 19:37:22 +02:00
54d97c5e61 chore: use local glyphon lockfile 2026-05-25 18:28:56 +02:00
ee5672eaed chore: refresh local dependency lockfile 2026-05-25 18:10:22 +02:00
4c30e5e3b7 fix(keybinds): adapt key_bind.matches to new 3-arg signature
Upstream libcosmic added an Option<&Physical> third parameter to
KeyBind::matches for physical-key matching. We pass None at every call
site since these paths only have the logical key available.

Also refresh Cargo.lock to satisfy the libcosmic-yoda squash rebase
absorbed on 2026-05-25.

Leyoda 2026 – GPLv3
2026-05-25 14:27:36 +02:00
2e9729a978 chore: align about license metadata 2026-05-25 12:11:21 +02:00
73defa2c05 chore: use local cosmic-text checkout 2026-05-25 11:34:38 +02:00
f243a13dfb yoda: refresh local dbus binding lock 2026-05-25 09:55:32 +02:00
3692bd04b2 chore: align editor with local files stack 2026-05-24 09:17:14 +02:00
f59c855551 yoda: relocate local fork paths from ~/Devels to ~/Projets/COSMIC
Mise à jour des path= absolus (window_clipboard, dnd, mime, cosmic-text)
après consolidation des forks cosmic-* sous ~/Projets/COSMIC/.

Leyoda 2026 – GPLv3
2026-05-16 18:08:50 +02:00
d872191032 yoda wayland-v5: redirect window_clipboard + cosmic-text to local forks
Propagates the [patch] blocks added in cosmic-yoterm v5 to keep the
whole yoda app family on a single Wayland-only stack. Without these,
iced_winit fails to select a window_clipboard version because our
fork exposes a `wayland` feature that upstream doesn't.

- window_clipboard → /home/lionel/Devels/window_clipboard (x11 gated
  behind opt-in feature)
- cosmic-text → /home/lionel/Devels/cosmic-text (EAW terminal_cells +
  upstream PR#503 applied)
2026-04-24 07:09:48 +02:00
16e060a996 lockfile: libcosmic-yoda 0.1.0-yoda -> 0.1.0-yoda.2
Picks up the yoda-v2 libcosmic changes (color_picker Theme ref +
context_menu/menu winit ungate). Binary rebuilt and installed.
2026-04-23 18:46:16 +02:00
6acd0a3704 yoda: rewire onto libcosmic-yoda + leyoda/cosmic-files paths
- libcosmic git dep replaced by libcosmic-yoda = { path = ../libcosmic }
- cosmic-files git dep replaced by path = ../cosmic-files (leyoda fork)
- winit feature dropped from libcosmic-yoda deps, wayland added
- feature refs libcosmic/* -> libcosmic-yoda/*
- [patch] block for pop-os/libcosmic removed

Installed at /usr/bin/cosmic-edit. Pre-yoda binary kept as
/usr/bin/cosmic-edit.pre-yoda-fork.
2026-04-23 15:43:04 +02:00
3 changed files with 339 additions and 677 deletions

981
Cargo.lock generated

File diff suppressed because it is too large Load diff

View file

@ -33,21 +33,22 @@ i18n-embed-fl = "0.10"
rust-embed = "8"
[dependencies.cosmic-files]
git = "https://github.com/pop-os/cosmic-files.git"
path = "../cosmic-files"
default-features = false
[dependencies.cosmic-syntax-theme]
git = "https://github.com/pop-os/cosmic-syntax-theme.git"
[dependencies.cosmic-text]
git = "https://github.com/pop-os/cosmic-text.git"
path = "../cosmic-text"
features = ["syntect", "vi"]
[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"
# Yoda fork.
[dependencies.libcosmic-yoda]
path = "../libcosmic"
default-features = false
#TODO: a11y feature crashes file choser dialog
features = ["about", "multi-window", "tokio", "winit", "surface-message"]
features = ["about", "multi-window", "tokio", "wayland", "surface-message"]
[target.'cfg(unix)'.dependencies]
fork = "0.2"
@ -57,10 +58,10 @@ xdgen = "0.1"
[features]
default = ["dbus-config", "gvfs", "wgpu", "wayland"]
dbus-config = ["libcosmic/dbus-config"]
dbus-config = ["libcosmic-yoda/dbus-config"]
gvfs = ["cosmic-files/gvfs"]
wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
[profile.release-with-debug]
inherits = "release"
@ -70,9 +71,12 @@ debug = true
onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
[patch.'https://github.com/pop-os/libcosmic']
libcosmic = { path = "../libcosmic" }
cosmic-config = { path = "../libcosmic/cosmic-config" }
cosmic-theme = { path = "../libcosmic/cosmic-theme" }
iced_futures = { path = "../libcosmic/iced/futures" }
iced_winit = { path = "../libcosmic/iced/winit" }
# Yoda wayland cut v5: redirect window_clipboard to the local fork
# (x11 gated behind opt-in feature).
[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
[patch.'https://github.com/pop-os/cosmic-text.git']
cosmic-text = { path = "../cosmic-text" }

View file

@ -1455,6 +1455,7 @@ impl Application for App {
.author("System76")
.comments(fl!("comment"))
.license("GPL-3.0-only")
.license_url("https://spdx.org/licenses/GPL-3.0-only")
.developers([("Jeremy Soller", "jeremy@system76.com")])
.links([
(fl!("repository"), "https://github.com/pop-os/cosmic-edit"),
@ -2126,7 +2127,7 @@ impl Application for App {
}
Message::Key(modifiers, key) => {
for (key_bind, action) in self.key_binds.iter() {
if key_bind.matches(modifiers, &key) {
if key_bind.matches(modifiers, &key, None) {
return self.update(action.message(None));
}
}