From 3de4b99e6620a586cc5b32cd6cbaec821a96d7ac Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Wed, 13 Dec 2023 13:41:39 -0500 Subject: [PATCH] refactor: use theme corner_radii --- Cargo.lock | 129 ++++++++++----------- app/src/pages/desktop/appearance.rs | 2 +- app/src/pages/desktop/wallpaper/mod.rs | 7 +- app/src/pages/desktop/wallpaper/widgets.rs | 10 +- app/src/pages/input/keyboard/mod.rs | 3 +- app/src/theme.rs | 34 +++--- 6 files changed, 99 insertions(+), 86 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 53e32e9..7b56e57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -371,7 +371,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -406,7 +406,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -578,7 +578,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -681,7 +681,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -895,7 +895,7 @@ dependencies = [ [[package]] name = "cosmic-comp-config" version = "0.1.0" -source = "git+https://github.com/pop-os/cosmic-comp#f9dc67a24a450ecf913734ae98e5aedf8c270c47" +source = "git+https://github.com/pop-os/cosmic-comp#a8b401b11df3b05336358f1bc7b4ee06f9ef53b5" dependencies = [ "input", "serde", @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "atomicwrites", "calloop", @@ -919,7 +919,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "quote", "syn 1.0.109", @@ -1071,7 +1071,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "almost", "cosmic-config", @@ -1102,9 +1102,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "14c3242926edf34aec4ac3a77108ad4854bffaa2e4ddc1824124ce59231302d5" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1112,9 +1112,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1123,22 +1123,21 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c06d96137f14f244c37f989d9fff8f95e6c18b918e71f36638f8c49112e4c78f" dependencies = [ "cfg-if", ] @@ -1182,7 +1181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1223,7 +1222,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1234,7 +1233,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1276,7 +1275,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1347,7 +1346,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1441,7 +1440,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1535,9 +1534,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.10" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbb8258be8305fb0237d7b295f47bb24ff1b136a535f473baf40e70468515aa" +checksum = "80f656be11ddf91bd709454d15d5bd896fbaf4cc3314e69349e4d1569f5b46cd" dependencies = [ "indenter", "once_cell", @@ -1735,7 +1734,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -1883,7 +1882,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -2237,7 +2236,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.40", + "syn 2.0.41", "unic-langid", ] @@ -2251,13 +2250,13 @@ dependencies = [ "i18n-config", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "iced_accessibility", "iced_core", @@ -2272,7 +2271,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "accesskit", "accesskit_unix", @@ -2281,7 +2280,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "bitflags 1.3.2", "iced_accessibility", @@ -2299,7 +2298,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "futures", "iced_core", @@ -2312,7 +2311,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2335,7 +2334,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2348,7 +2347,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "iced_accessibility", "iced_core", @@ -2360,7 +2359,7 @@ dependencies = [ [[package]] name = "iced_sctk" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "enum-repr", "float-cmp", @@ -2384,7 +2383,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "iced_core", "once_cell", @@ -2394,7 +2393,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "bytemuck", "cosmic-text", @@ -2412,7 +2411,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2432,7 +2431,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "iced_renderer", "iced_runtime", @@ -2525,7 +2524,7 @@ checksum = "d2abdd3a62551e8337af119c5899e600ca0c88ec8f23a46c60ba216c803dcf1a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -2807,7 +2806,7 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic#56965ac2e5841252fca4e628b3dc0db52094faa2" +source = "git+https://github.com/pop-os/libcosmic#310064ca1dccf86e89a166c350d7bd212ef23052" dependencies = [ "apply", "ashpd", @@ -3398,7 +3397,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3434,7 +3433,7 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3533,7 +3532,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3568,7 +3567,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -3945,7 +3944,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.40", + "syn 2.0.41", "walkdir", ] @@ -4100,7 +4099,7 @@ checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4111,7 +4110,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4426,9 +4425,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.40" +version = "2.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" +checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" dependencies = [ "proc-macro2", "quote", @@ -4443,7 +4442,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "unicode-xid", ] @@ -4527,7 +4526,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4714,7 +4713,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -4812,18 +4811,18 @@ dependencies = [ [[package]] name = "unic-langid" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "887622f8e7b723780c5e64b04dcc0c9b8f426ada7cca6790cd3ea3bf0f08037a" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5adeb847e35eed4efbffd9fb2e4d078b91ece56e4d6a3c0d2df55b3a1dac07d5" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" dependencies = [ "serde", "tinystr", @@ -5044,7 +5043,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "wasm-bindgen-shared", ] @@ -5078,7 +5077,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5816,7 +5815,7 @@ checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "synstructure", ] @@ -5910,7 +5909,7 @@ checksum = "be912bf68235a88fbefd1b73415cb218405958d1655b2ece9035a19920bdf6ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] @@ -5930,7 +5929,7 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", "synstructure", ] @@ -5964,7 +5963,7 @@ checksum = "7b4e5997cbf58990550ef1f0e5124a05e47e1ebd33a84af25739be6031a62c20" dependencies = [ "proc-macro2", "quote", - "syn 2.0.40", + "syn 2.0.41", ] [[package]] diff --git a/app/src/pages/desktop/appearance.rs b/app/src/pages/desktop/appearance.rs index d1d64c6..5d76156 100644 --- a/app/src/pages/desktop/appearance.rs +++ b/app/src/pages/desktop/appearance.rs @@ -1434,7 +1434,7 @@ pub fn color_button<'a, Message: 'a + Clone>( wallpaper::Color::Single([color.r, color.g, color.b]), width, height, - 8.0, + None, )) .padding(0) .selected(selected) diff --git a/app/src/pages/desktop/wallpaper/mod.rs b/app/src/pages/desktop/wallpaper/mod.rs index e1f748a..9d01140 100644 --- a/app/src/pages/desktop/wallpaper/mod.rs +++ b/app/src/pages/desktop/wallpaper/mod.rs @@ -928,7 +928,12 @@ pub fn settings() -> Section { // Displays color options, and hides the slideshow toggle Choice::Color(ref color) => { show_slideshow_toggle = false; - widgets::color_image(color.clone(), SIMULATED_WIDTH, SIMULATED_HEIGHT, 0.0) + widgets::color_image( + color.clone(), + SIMULATED_WIDTH, + SIMULATED_HEIGHT, + Some(0.0), + ) } }, )); diff --git a/app/src/pages/desktop/wallpaper/widgets.rs b/app/src/pages/desktop/wallpaper/widgets.rs index 9358655..165223a 100644 --- a/app/src/pages/desktop/wallpaper/widgets.rs +++ b/app/src/pages/desktop/wallpaper/widgets.rs @@ -20,7 +20,7 @@ pub fn color_button( removable: bool, selected: bool, ) -> Element<'static, Message> { - let content = color_image(color.clone(), COLOR_WIDTH, COLOR_WIDTH, 8.0); + let content = color_image(color.clone(), COLOR_WIDTH, COLOR_WIDTH, None); let on_remove = if removable { Some(Message::ColorRemove(color.clone())) } else { @@ -40,10 +40,10 @@ pub fn color_image<'a, M: 'a>( color: wallpaper::Color, width: u16, height: u16, - border_radius: f32, + border_radius: Option, ) -> Element<'a, M> { container(space::Space::new(width, height)) - .style(cosmic::theme::Container::custom(move |_theme| { + .style(cosmic::theme::Container::custom(move |theme| { container::Appearance { icon_color: None, text_color: None, @@ -66,7 +66,9 @@ pub fn color_image<'a, M: 'a>( Background::Gradient(iced_core::Gradient::Linear(linear)) } }), - border_radius: BorderRadius::from(border_radius), + border_radius: border_radius + .map(|br| br.into()) + .unwrap_or_else(|| theme.cosmic().corner_radii.radius_s.into()), border_width: 0.0, border_color: Color::TRANSPARENT, } diff --git a/app/src/pages/input/keyboard/mod.rs b/app/src/pages/input/keyboard/mod.rs index 23eb936..758b091 100644 --- a/app/src/pages/input/keyboard/mod.rs +++ b/app/src/pages/input/keyboard/mod.rs @@ -93,11 +93,12 @@ fn popover_menu() -> cosmic::Element<'static, Message> { .height(Length::Shrink) .apply(cosmic::widget::container) .style(cosmic::theme::Container::custom(|theme| { + let cosmic = theme.cosmic(); container::Appearance { icon_color: Some(theme.cosmic().background.on.into()), text_color: Some(theme.cosmic().background.on.into()), background: Some(iced::Color::from(theme.cosmic().background.base).into()), - border_radius: (12.0).into(), + border_radius: cosmic.corner_radii.radius_m.into(), border_width: 0.0, border_color: iced::Color::TRANSPARENT, } diff --git a/app/src/theme.rs b/app/src/theme.rs index 9b72506..6aca215 100644 --- a/app/src/theme.rs +++ b/app/src/theme.rs @@ -5,24 +5,30 @@ use cosmic::{iced_widget::core::BorderRadius, theme}; #[must_use] pub fn display_container_frame() -> cosmic::theme::Container { - theme::Container::custom(|_theme| cosmic::widget::container::Appearance { - icon_color: None, - text_color: None, - background: Some(cosmic::iced::Background::Color(cosmic::iced::Color::WHITE)), - border_color: cosmic::iced::Color::WHITE, - border_radius: BorderRadius::from(4.0), - border_width: 3.0, + theme::Container::custom(|theme| { + let cosmic = theme.cosmic(); + cosmic::widget::container::Appearance { + icon_color: None, + text_color: None, + background: Some(cosmic::iced::Background::Color(cosmic::iced::Color::WHITE)), + border_color: cosmic::iced::Color::WHITE, + border_radius: cosmic.corner_radii.radius_xs.into(), + border_width: 3.0, + } }) } #[must_use] pub fn display_container_screen() -> cosmic::theme::Container { - theme::Container::custom(|_theme| cosmic::widget::container::Appearance { - icon_color: None, - text_color: None, - background: Some(cosmic::iced::Background::Color(cosmic::iced::Color::BLACK)), - border_color: cosmic::iced::Color::BLACK, - border_radius: BorderRadius::from(0.0), - border_width: 0.0, + theme::Container::custom(|theme| { + let cosmic = theme.cosmic(); + cosmic::widget::container::Appearance { + icon_color: None, + text_color: None, + background: Some(cosmic::iced::Background::Color(cosmic::iced::Color::BLACK)), + border_color: cosmic::iced::Color::BLACK, + border_radius: cosmic.corner_radii.radius_0.into(), + border_width: 0.0, + } }) }