Compare commits
12 commits
backup/pre
...
local/libc
| Author | SHA1 | Date | |
|---|---|---|---|
| 4391e53a8d | |||
| 54d97c5e61 | |||
| ee5672eaed | |||
| 4c30e5e3b7 | |||
| 2e9729a978 | |||
| 73defa2c05 | |||
| f243a13dfb | |||
| 3692bd04b2 | |||
| f59c855551 | |||
| d872191032 | |||
| 16e060a996 | |||
| 6acd0a3704 |
3 changed files with 339 additions and 677 deletions
981
Cargo.lock
generated
981
Cargo.lock
generated
File diff suppressed because it is too large
Load diff
32
Cargo.toml
32
Cargo.toml
|
|
@ -33,21 +33,22 @@ i18n-embed-fl = "0.10"
|
||||||
rust-embed = "8"
|
rust-embed = "8"
|
||||||
|
|
||||||
[dependencies.cosmic-files]
|
[dependencies.cosmic-files]
|
||||||
git = "https://github.com/pop-os/cosmic-files.git"
|
path = "../cosmic-files"
|
||||||
default-features = false
|
default-features = false
|
||||||
|
|
||||||
[dependencies.cosmic-syntax-theme]
|
[dependencies.cosmic-syntax-theme]
|
||||||
git = "https://github.com/pop-os/cosmic-syntax-theme.git"
|
git = "https://github.com/pop-os/cosmic-syntax-theme.git"
|
||||||
|
|
||||||
[dependencies.cosmic-text]
|
[dependencies.cosmic-text]
|
||||||
git = "https://github.com/pop-os/cosmic-text.git"
|
path = "../cosmic-text"
|
||||||
features = ["syntect", "vi"]
|
features = ["syntect", "vi"]
|
||||||
|
|
||||||
[dependencies.libcosmic]
|
# Yoda fork.
|
||||||
git = "https://github.com/pop-os/libcosmic.git"
|
[dependencies.libcosmic-yoda]
|
||||||
|
path = "../libcosmic"
|
||||||
default-features = false
|
default-features = false
|
||||||
#TODO: a11y feature crashes file choser dialog
|
#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]
|
[target.'cfg(unix)'.dependencies]
|
||||||
fork = "0.2"
|
fork = "0.2"
|
||||||
|
|
@ -57,10 +58,10 @@ xdgen = "0.1"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["dbus-config", "gvfs", "wgpu", "wayland"]
|
default = ["dbus-config", "gvfs", "wgpu", "wayland"]
|
||||||
dbus-config = ["libcosmic/dbus-config"]
|
dbus-config = ["libcosmic-yoda/dbus-config"]
|
||||||
gvfs = ["cosmic-files/gvfs"]
|
gvfs = ["cosmic-files/gvfs"]
|
||||||
wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
|
wgpu = ["libcosmic-yoda/wgpu", "cosmic-files/wgpu"]
|
||||||
wayland = ["libcosmic/wayland", "cosmic-files/wayland"]
|
wayland = ["libcosmic-yoda/wayland", "cosmic-files/wayland"]
|
||||||
|
|
||||||
[profile.release-with-debug]
|
[profile.release-with-debug]
|
||||||
inherits = "release"
|
inherits = "release"
|
||||||
|
|
@ -70,9 +71,12 @@ debug = true
|
||||||
onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
|
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" }
|
onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
|
||||||
|
|
||||||
[patch.'https://github.com/pop-os/libcosmic']
|
# Yoda wayland cut v5: redirect window_clipboard to the local fork
|
||||||
libcosmic = { path = "../libcosmic" }
|
# (x11 gated behind opt-in feature).
|
||||||
cosmic-config = { path = "../libcosmic/cosmic-config" }
|
[patch.'https://forge.aditua.com/leyoda/window_clipboard.git']
|
||||||
cosmic-theme = { path = "../libcosmic/cosmic-theme" }
|
window_clipboard = { path = "/home/lionel/Projets/COSMIC/window_clipboard" }
|
||||||
iced_futures = { path = "../libcosmic/iced/futures" }
|
dnd = { path = "/home/lionel/Projets/COSMIC/window_clipboard/dnd" }
|
||||||
iced_winit = { path = "../libcosmic/iced/winit" }
|
mime = { path = "/home/lionel/Projets/COSMIC/window_clipboard/mime" }
|
||||||
|
|
||||||
|
[patch.'https://github.com/pop-os/cosmic-text.git']
|
||||||
|
cosmic-text = { path = "../cosmic-text" }
|
||||||
|
|
|
||||||
|
|
@ -1455,6 +1455,7 @@ impl Application for App {
|
||||||
.author("System76")
|
.author("System76")
|
||||||
.comments(fl!("comment"))
|
.comments(fl!("comment"))
|
||||||
.license("GPL-3.0-only")
|
.license("GPL-3.0-only")
|
||||||
|
.license_url("https://spdx.org/licenses/GPL-3.0-only")
|
||||||
.developers([("Jeremy Soller", "jeremy@system76.com")])
|
.developers([("Jeremy Soller", "jeremy@system76.com")])
|
||||||
.links([
|
.links([
|
||||||
(fl!("repository"), "https://github.com/pop-os/cosmic-edit"),
|
(fl!("repository"), "https://github.com/pop-os/cosmic-edit"),
|
||||||
|
|
@ -2126,7 +2127,7 @@ impl Application for App {
|
||||||
}
|
}
|
||||||
Message::Key(modifiers, key) => {
|
Message::Key(modifiers, key) => {
|
||||||
for (key_bind, action) in self.key_binds.iter() {
|
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));
|
return self.update(action.message(None));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue