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

update libcosmic

Browse source
This commit is contained in:
Vukašin Vojinović 2025-03-13 20:16:20 +01:00 • committed by Jeremy Soller
parent 52374a20d3
commit fe21878169
2 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Cargo.lock generated
View file

@ -1171,7 +1171,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -1190,7 +1190,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -1302,8 +1302,8 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-text" name = "cosmic-text"
version = "0.12.1" version = "0.13.2"
source = "git+https://github.com/pop-os/cosmic-text.git#974ddaed96b334f560b606ebe5d2ca2d2f9f23ef" source = "git+https://github.com/pop-os/cosmic-text.git#500a8fc6d172de5c9e08c6013070b6b7fcdf79dd"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"fontdb 0.16.2", "fontdb 0.16.2",
@ -1325,7 +1325,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"almost", "almost",
"cosmic-config", "cosmic-config",
@ -2673,7 +2673,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -2691,7 +2691,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_winit", "accesskit_winit",
@ -2700,7 +2700,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"bytes", "bytes",
@ -2724,7 +2724,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2750,7 +2750,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"bitflags 2.8.0", "bitflags 2.8.0",
"bytemuck", "bytemuck",
@ -2772,7 +2772,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2784,7 +2784,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"bytes", "bytes",
"dnd", "dnd",
@ -2799,7 +2799,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2815,7 +2815,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"as-raw-xcb-connection", "as-raw-xcb-connection",
"bitflags 2.8.0", "bitflags 2.8.0",
@ -2846,7 +2846,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -2864,7 +2864,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_winit" name = "iced_winit"
version = "0.14.0-dev" version = "0.14.0-dev"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"dnd", "dnd",
"iced_accessibility", "iced_accessibility",
@ -3442,7 +3442,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic.git#50d2104485649bdddf1247f63ec3cf2eb81c5817" source = "git+https://github.com/pop-os/libcosmic.git#c7edd37b03cac28650cb96023a9cb965d3e062ac"
dependencies = [ dependencies = [
"apply", "apply",
"ashpd 0.9.2", "ashpd 0.9.2",

9
src/terminal_box.rs
View file

@ -290,7 +290,10 @@ where
let state = tree.state.downcast_ref::<State>(); let state = tree.state.downcast_ref::<State>();
let cosmic_theme = theme.cosmic(); let cosmic_theme = theme.cosmic();
let radius_s = cosmic_theme.corner_radii.radius_s[0] - 1.0; // matches the corners to the window border
let corner_radius = cosmic_theme
.radius_s()
.map(|x| if x < 4.0 { x - 1.0 } else { x + 3.0 });
let scrollbar_w = f32::from(cosmic_theme.spacing.space_xxs); let scrollbar_w = f32::from(cosmic_theme.spacing.space_xxs);
let view_position = layout.position() + [self.padding.left, self.padding.top].into(); let view_position = layout.position() + [self.padding.left, self.padding.top].into();
@ -326,9 +329,9 @@ where
bounds: layout.bounds(), bounds: layout.bounds(),
border: Border { border: Border {
radius: if self.show_headerbar { radius: if self.show_headerbar {
[0.0, 0.0, radius_s, radius_s].into() [0.0, 0.0, corner_radius[2], corner_radius[3]].into()
} else { } else {
[radius_s, radius_s, radius_s, radius_s].into() corner_radius.into()
}, },
width: self.border.width, width: self.border.width,
color: self.border.color, color: self.border.color,