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

Compare commits

base: leyoda:local/libcosmic-path-patch
Branches Tags
leyoda:local/libcosmic-path-patch
leyoda:backup/pre-yoda-fork-20260422
..
compare: leyoda:backup/pre-yoda-fork-20260422
Branches Tags
leyoda:local/libcosmic-path-patch
leyoda:backup/pre-yoda-fork-20260422

No commits in common. "local/libcosmic-path-patch" and "backup/pre-yoda-fork-20260422" have entirely different histories.
local/libc ... backup/pre

3 changed files with 678 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

983
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

32
Cargo.toml
View file

@ -33,22 +33,21 @@ i18n-embed-fl = "0.10"
rust-embed = "8"
[dependencies.cosmic-files]
path = "../cosmic-files"
git = "https://github.com/pop-os/cosmic-files.git"
default-features = false
[dependencies.cosmic-syntax-theme]
git = "https://github.com/pop-os/cosmic-syntax-theme.git"
[dependencies.cosmic-text]
path = "../cosmic-text"
git = "https://github.com/pop-os/cosmic-text.git"
features = ["syntect", "vi"]
# Yoda fork.
[dependencies.libcosmic-yoda]
path = "../libcosmic"
[dependencies.libcosmic]
git = "https://github.com/pop-os/libcosmic.git"
default-features = false
#TODO: a11y feature crashes file choser dialog
features = ["about", "multi-window", "tokio", "wayland", "surface-message"]
features = ["about", "multi-window", "tokio", "winit", "surface-message"]
[target.'cfg(unix)'.dependencies]
fork = "0.2"
@ -58,10 +57,10 @@ xdgen = "0.1"
[features]
default = ["dbus-config", "gvfs", "wgpu", "wayland"]
dbus-config = ["libcosmic-yoda/dbus-config"]
dbus-config = ["libcosmic/dbus-config"]
gvfs = ["cosmic-files/gvfs"]
wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
[profile.release-with-debug]
inherits = "release"
@ -71,12 +70,9 @@ 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" }
# 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" }
[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" }

3
src/main.rs
View file

@ -1455,7 +1455,6 @@ 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"),
@ -2127,7 +2126,7 @@ impl Application for App {
}
Message::Key(modifiers, key) => {
for (key_bind, action) in self.key_binds.iter() {
if key_bind.matches(modifiers, &key, None) {
if key_bind.matches(modifiers, &key) {
return self.update(action.message(None));
}
}