chore: update libcosmic

pop-os · Feb 27, 2024 · 6c6c0b4 · 6c6c0b4
1 parent 111e31c
commit 6c6c0b4
Show file tree

Hide file tree

Showing 8 changed files with 157 additions and 135 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/app/src/pages/desktop/wallpaper/mod.rs b/app/src/pages/desktop/wallpaper/mod.rs
@@ -20,7 +20,7 @@ use cosmic::{
     widget::{
         button, dropdown, list_column, row,
         segmented_button::{self, SingleSelectModel},
-        settings, text, toggler, view_switcher,
+        settings, tab_bar, text, toggler,
     },
 };
 use cosmic::{
@@ -1113,7 +1113,7 @@ pub fn settings() -> Section<crate::pages::Message> {
                     .height(Length::Fixed(32.0))
                     .into()
             } else {
-                view_switcher::horizontal(&page.outputs)
+                tab_bar::horizontal(&page.outputs)
                     .on_activate(Message::Output)
                     .into()
             });

diff --git a/app/src/pages/desktop/workspaces.rs b/app/src/pages/desktop/workspaces.rs
@@ -188,7 +188,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
         .view::<Page>(|_binder, page, section| {
             settings::view_section(&section.title)
                 .add(
-                    cosmic::widget::segmented_selection::horizontal(&page.orientation_model)
+                    cosmic::widget::segmented_control::horizontal(&page.orientation_model)
                         .on_activate(Message::OrientationButtonSelected),
                 )
                 .apply(Element::from)

diff --git a/app/src/pages/display/mod.rs b/app/src/pages/display/mod.rs
@@ -11,7 +11,7 @@ use arrangement::Arrangement;
 use cosmic::iced::Length;
 use cosmic::iced_widget::scrollable::{Direction, Properties, RelativeOffset};
 use cosmic::widget::{
-    column, container, dropdown, list_column, segmented_button, toggler, view_switcher,
+    column, container, dropdown, list_column, segmented_button, tab_bar, toggler,
 };
 use cosmic::{command, Command, Element};
 use cosmic_randr_shell::{List, Output, OutputKey, Transform};
@@ -460,7 +460,7 @@ impl Page {
 
         if self.list.outputs.len() > 1 {
             let display_switcher =
-                view_switcher::horizontal(&self.display_tabs).on_activate(Message::Display);
+                tab_bar::horizontal(&self.display_tabs).on_activate(Message::Display);
 
             let display_enable = list_column().add(cosmic::widget::settings::item(
                 &*text::DISPLAY_ENABLE,

diff --git a/app/src/pages/input/mouse.rs b/app/src/pages/input/mouse.rs
@@ -58,7 +58,7 @@ fn mouse() -> Section<crate::pages::Message> {
             settings::view_section(&section.title)
                 .add(settings::item(
                     &*super::PRIMARY_BUTTON,
-                    cosmic::widget::segmented_selection::horizontal(&input.primary_button)
+                    cosmic::widget::segmented_control::horizontal(&input.primary_button)
                         .minimum_button_width(0)
                         .on_activate(|x| Message::PrimaryButtonSelected(x, false)),
                 ))

diff --git a/app/src/pages/input/touchpad.rs b/app/src/pages/input/touchpad.rs
@@ -73,7 +73,7 @@ fn touchpad() -> Section<crate::pages::Message> {
             settings::view_section(&section.title)
                 .add(settings::item(
                     &*super::PRIMARY_BUTTON,
-                    cosmic::widget::segmented_selection::horizontal(&input.touchpad_primary_button)
+                    cosmic::widget::segmented_control::horizontal(&input.touchpad_primary_button)
                         .minimum_button_width(0)
                         .on_activate(|x| Message::PrimaryButtonSelected(x, true)),
                 ))

diff --git a/resources/default_schema/com.system76.CosmicTheme.Dark/v1/shade b/resources/default_schema/com.system76.CosmicTheme.Dark/v1/shade
@@ -0,0 +1,6 @@
+(
+    red: 0.0,
+    green: 0.0,
+    blue: 0.0,
+    alpha: 0.32,
+)
diff --git a/resources/default_schema/com.system76.CosmicTheme.Light/v1/shade b/resources/default_schema/com.system76.CosmicTheme.Light/v1/shade
@@ -0,0 +1,6 @@
+(
+    red: 0.0,
+    green: 0.0,
+    blue: 0.0,
+    alpha: 0.08,
+)