From fe218781698410efd10e4ee04ff893b02a492883 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vuka=C5=A1in=20Vojinovi=C4=87?= Date: Thu, 13 Mar 2025 20:16:20 +0100 Subject: [PATCH] update libcosmic --- Cargo.lock | 34 +++++++++++++++++----------------- src/terminal_box.rs | 9 ++++++--- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 11ec1aa..a784a70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1171,7 +1171,7 @@ dependencies = [ [[package]] name = "cosmic-config" 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 = [ "atomicwrites", "cosmic-config-derive", @@ -1190,7 +1190,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" 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 = [ "quote", "syn 1.0.109", @@ -1302,8 +1302,8 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.12.1" -source = "git+https://github.com/pop-os/cosmic-text.git#974ddaed96b334f560b606ebe5d2ca2d2f9f23ef" +version = "0.13.2" +source = "git+https://github.com/pop-os/cosmic-text.git#500a8fc6d172de5c9e08c6013070b6b7fcdf79dd" dependencies = [ "bitflags 2.8.0", "fontdb 0.16.2", @@ -1325,7 +1325,7 @@ dependencies = [ [[package]] name = "cosmic-theme" 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 = [ "almost", "cosmic-config", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "iced" 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 = [ "dnd", "iced_accessibility", @@ -2691,7 +2691,7 @@ dependencies = [ [[package]] name = "iced_accessibility" 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 = [ "accesskit", "accesskit_winit", @@ -2700,7 +2700,7 @@ dependencies = [ [[package]] name = "iced_core" 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 = [ "bitflags 2.8.0", "bytes", @@ -2724,7 +2724,7 @@ dependencies = [ [[package]] name = "iced_futures" 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 = [ "futures", "iced_core", @@ -2750,7 +2750,7 @@ dependencies = [ [[package]] name = "iced_graphics" 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 = [ "bitflags 2.8.0", "bytemuck", @@ -2772,7 +2772,7 @@ dependencies = [ [[package]] name = "iced_renderer" 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 = [ "iced_graphics", "iced_tiny_skia", @@ -2784,7 +2784,7 @@ dependencies = [ [[package]] name = "iced_runtime" 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 = [ "bytes", "dnd", @@ -2799,7 +2799,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" 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 = [ "bytemuck", "cosmic-text", @@ -2815,7 +2815,7 @@ dependencies = [ [[package]] name = "iced_wgpu" 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 = [ "as-raw-xcb-connection", "bitflags 2.8.0", @@ -2846,7 +2846,7 @@ dependencies = [ [[package]] name = "iced_widget" 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 = [ "dnd", "iced_accessibility", @@ -2864,7 +2864,7 @@ dependencies = [ [[package]] name = "iced_winit" 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 = [ "dnd", "iced_accessibility", @@ -3442,7 +3442,7 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libcosmic" 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 = [ "apply", "ashpd 0.9.2", diff --git a/src/terminal_box.rs b/src/terminal_box.rs index 5513e68..cc95f1b 100644 --- a/src/terminal_box.rs +++ b/src/terminal_box.rs @@ -290,7 +290,10 @@ where let state = tree.state.downcast_ref::(); 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 view_position = layout.position() + [self.padding.left, self.padding.top].into(); @@ -326,9 +329,9 @@ where bounds: layout.bounds(), border: Border { 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 { - [radius_s, radius_s, radius_s, radius_s].into() + corner_radius.into() }, width: self.border.width, color: self.border.color,