From 2193003ada6283ee58a166d65927100880d45cde Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Thu, 21 Dec 2023 11:57:52 -0700 Subject: [PATCH] Use 85% opacity by default --- Cargo.lock | 32 ++++++++++++++++---------------- Cargo.toml | 2 ++ src/main.rs | 4 +++- src/terminal_box.rs | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 82a4d25..e0b068c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -874,7 +874,7 @@ dependencies = [ [[package]] name = "cosmic-config" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "atomicwrites", "cosmic-config-derive", @@ -888,7 +888,7 @@ dependencies = [ [[package]] name = "cosmic-config-derive" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "quote", "syn 1.0.109", @@ -929,7 +929,7 @@ dependencies = [ [[package]] name = "cosmic-theme" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "almost", "cosmic-config", @@ -1958,7 +1958,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iced" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "iced_accessibility", "iced_core", @@ -1973,7 +1973,7 @@ dependencies = [ [[package]] name = "iced_accessibility" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "accesskit", "accesskit_winit", @@ -1982,7 +1982,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "bitflags 1.3.2", "instant", @@ -1998,7 +1998,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "futures", "iced_core", @@ -2011,7 +2011,7 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2034,7 +2034,7 @@ dependencies = [ [[package]] name = "iced_renderer" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -2047,7 +2047,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "iced_core", "iced_futures", @@ -2057,7 +2057,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "iced_core", "once_cell", @@ -2067,7 +2067,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "bytemuck", "cosmic-text", @@ -2085,7 +2085,7 @@ dependencies = [ [[package]] name = "iced_wgpu" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -2105,7 +2105,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "iced_renderer", "iced_runtime", @@ -2119,7 +2119,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.12.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "iced_graphics", "iced_runtime", @@ -2382,7 +2382,7 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libcosmic" version = "0.1.0" -source = "git+https://github.com/pop-os/libcosmic.git#18a5c670656f53aed4b9318b633f925403ba2e02" +source = "git+https://github.com/pop-os/libcosmic.git?branch=content-container#5e7b82f6b5a7396e888c4ca819f22663efcf6111" dependencies = [ "apply", "ashpd", diff --git a/Cargo.toml b/Cargo.toml index 5f6fbdf..90d415f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,8 +17,10 @@ branch = "refactor" [dependencies.libcosmic] git = "https://github.com/pop-os/libcosmic.git" +branch = "content-container" default-features = false features = ["tokio", "winit"] +#path = "../libcosmic" [features] default = ["wgpu"] diff --git a/src/main.rs b/src/main.rs index fe95935..76ee91a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -98,7 +98,9 @@ impl cosmic::Application for App { } /// Creates the application, and optionally emits command on initialize. - fn init(core: Core, term_config: Self::Flags) -> (Self, Command) { + fn init(mut core: Core, term_config: Self::Flags) -> (Self, Command) { + core.window.content_container = false; + let mut app = App { core, tab_model: segmented_button::ModelBuilder::default().build(), diff --git a/src/terminal_box.rs b/src/terminal_box.rs index b42d74f..20db50a 100644 --- a/src/terminal_box.rs +++ b/src/terminal_box.rs @@ -220,7 +220,7 @@ where background_color.r() as f32 / 255.0, background_color.g() as f32 / 255.0, background_color.b() as f32 / 255.0, - background_color.a() as f32 / 255.0, + 0.85, /* background_color.a() as f32 / 255.0 */ ), ); }