wayland: disable title text drawn with crossfont crate

raphamorim · Jan 11, 2025 · 5e4f1c2 · 5e4f1c2
1 parent 945ef77
commit 5e4f1c2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 210 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,17 +28,17 @@ documentation = "https://github.com/raphamorim/rio#readme"
 # Note: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#multiple-locations
 # Sugarloaf example uses path when used locally, but uses
 # version from crates.io when published.
-teletypewriter = { path = "teletypewriter", version = "0.2.2" }
-rio-backend = { path = "rio-backend", version = "0.2.2" }
-rio-window = { path = "rio-window", version = "0.2.2", default-features = false }
+teletypewriter = { path = "teletypewriter", version = "0.2.3" }
+rio-backend = { path = "rio-backend", version = "0.2.3" }
+rio-window = { path = "rio-window", version = "0.2.3", default-features = false }
 
 # Own dependencies
-copa = { path = "copa", default-features = false, version = "0.2.2" }
-rio-proc-macros = { path = "rio-proc-macros", version = "0.2.2" }
-corcovado = { path = "corcovado", version = "0.2.2" }
+copa = { path = "copa", default-features = false, version = "0.2.3" }
+rio-proc-macros = { path = "rio-proc-macros", version = "0.2.3" }
+corcovado = { path = "corcovado", version = "0.2.3" }
 wa = { path = "wa", version = "0.1.7" }
 
-sugarloaf = { path = "sugarloaf", version = "0.2.2" }
+sugarloaf = { path = "sugarloaf", version = "0.2.3" }
 raw-window-handle = { version = "0.6.2", features = ["std"] }
 parking_lot = { version = "0.12.3", features = ["nightly", "hardware-lock-elision"] }
 rustc-hash = "2.1.0"

diff --git a/frontends/rioterm/Cargo.toml b/frontends/rioterm/Cargo.toml
@@ -73,9 +73,10 @@ wayland = [
     "rio-backend/wayland",
     "rio-window/wayland",
     "rio-window/wayland-dlopen",
-    "rio-window/wayland-csd-adwaita-crossfont",
 ]
 
+# "rio-window/wayland-csd-adwaita-crossfont",
+
 [package.metadata.deb]
 name = "rioterm"
 maintainer = "Raphael Amorim <[email protected]>"

diff --git a/rio-window/Cargo.toml b/rio-window/Cargo.toml
@@ -27,7 +27,7 @@ wayland = [
 ]
 wayland-dlopen = ["wayland-backend/dlopen"]
 wayland-csd-adwaita = ["sctk-adwaita", "sctk-adwaita/ab_glyph"]
-wayland-csd-adwaita-crossfont = ["sctk-adwaita", "sctk-adwaita/crossfont"]
+# wayland-csd-adwaita-crossfont = ["sctk-adwaita", "sctk-adwaita/crossfont"]
 wayland-csd-adwaita-notitle = ["sctk-adwaita"]
 
 [build-dependencies]

diff --git a/sugarloaf/Cargo.toml b/sugarloaf/Cargo.toml
@@ -77,7 +77,7 @@ ttf-parser = { version = "0.25.0" }
 fontconfig-parser = { version = "0.5.7", default-features = false }
 
 [dev-dependencies]
-rio-window = "0.2.1"
+rio-window = { workspace = true }
 png = "0.17.8"
 deflate = "1.0.0"
 criterion = "0.5.1"