fixup! feat(Workspace): add missing settings and update design

pop-os · Oct 20, 2024 · 43aa41e · 43aa41e
1 parent 529c3ca
commit 43aa41e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -65,3 +65,6 @@ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev =
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }
 # upower_dbus = { path = "../dbus-settings-bindings/upower" }
+
+[patch.'https://github.com/pop-os/cosmic-comp']
+cosmic-comp-config = { path = "../cosmic-comp/cosmic-comp-config" }
diff --git a/cosmic-settings/src/pages/desktop/workspaces.rs b/cosmic-settings/src/pages/desktop/workspaces.rs
@@ -409,7 +409,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
                             cosmic::iced::widget::row!(
                                 text(&descriptions[switch_workspace]),
                                 cosmic::iced::widget::horizontal_space(2),
-                                text(&descriptions[switch_ws_label]).font(cosmic::font::FONT_BOLD),
+                                text(&descriptions[switch_ws_label]).font(cosmic::font::bold()),
                                 cosmic::iced::widget::horizontal_space(Length::Fill),
                                 cosmic::iced::widget::container(cosmic::iced::widget::svg(
                                     switch_ws
@@ -425,7 +425,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
                             cosmic::iced::widget::row!(
                                 text(&descriptions[open_workspaces]),
                                 cosmic::iced::widget::horizontal_space(2),
-                                text(&descriptions[open_ws_label]).font(cosmic::font::FONT_BOLD),
+                                text(&descriptions[open_ws_label]).font(cosmic::font::bold()),
                                 cosmic::iced::widget::horizontal_space(Length::Fill),
                                 cosmic::iced::widget::container(cosmic::iced::widget::svg(open_ws))
                                     .width(115)
@@ -441,7 +441,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
                                     text(&descriptions[open_applications]),
                                     cosmic::iced::widget::horizontal_space(2),
                                     text(&descriptions[open_app_label])
-                                        .font(cosmic::font::FONT_BOLD),
+                                        .font(cosmic::font::bold()),
                                     cosmic::iced::widget::horizontal_space(Length::Fill),
                                     cosmic::iced::widget::container(cosmic::iced::widget::svg(
                                         open_app
@@ -474,7 +474,8 @@ fn workspace_overview() -> Section<crate::pages::Message> {
         .descriptions(descriptions)
         .view::<Page>(move |_binder, page, section| {
             let descriptions = &section.descriptions;
-            settings::view_section(&section.title)
+            settings::section()
+                .title(&section.title)
                 .add(
                     settings::item::builder(&descriptions[show_number])
                         .toggler(page.show_workspace_name, Message::SetShowName),