Skip to content

Commit 0608b3e

Browse files
committed
fixup! feat(Workspace): add missing settings and update design
1 parent 69aad39 commit 0608b3e

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", rev =
6060
# upower_dbus = { path = "../dbus-settings-bindings/upower" }
6161
[patch."https://github.com/smithay/client-toolkit.git"]
6262
sctk = { package = "smithay-client-toolkit", version = "=0.19.2" }
63+
64+
[patch.'https://github.com/pop-os/cosmic-comp']
65+
cosmic-comp-config = { path = "../cosmic-comp/cosmic-comp-config" }

cosmic-settings/src/pages/desktop/workspaces.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
409409
cosmic::iced::widget::row!(
410410
text(&descriptions[switch_workspace]),
411411
cosmic::iced::widget::horizontal_space(2),
412-
text(&descriptions[switch_ws_label]).font(cosmic::font::FONT_BOLD),
412+
text(&descriptions[switch_ws_label]).font(cosmic::font::bold()),
413413
cosmic::iced::widget::horizontal_space(Length::Fill),
414414
cosmic::iced::widget::container(cosmic::iced::widget::svg(
415415
switch_ws
@@ -425,7 +425,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
425425
cosmic::iced::widget::row!(
426426
text(&descriptions[open_workspaces]),
427427
cosmic::iced::widget::horizontal_space(2),
428-
text(&descriptions[open_ws_label]).font(cosmic::font::FONT_BOLD),
428+
text(&descriptions[open_ws_label]).font(cosmic::font::bold()),
429429
cosmic::iced::widget::horizontal_space(Length::Fill),
430430
cosmic::iced::widget::container(cosmic::iced::widget::svg(open_ws))
431431
.width(115)
@@ -441,7 +441,7 @@ fn workspace_orientation() -> Section<crate::pages::Message> {
441441
text(&descriptions[open_applications]),
442442
cosmic::iced::widget::horizontal_space(2),
443443
text(&descriptions[open_app_label])
444-
.font(cosmic::font::FONT_BOLD),
444+
.font(cosmic::font::bold()),
445445
cosmic::iced::widget::horizontal_space(Length::Fill),
446446
cosmic::iced::widget::container(cosmic::iced::widget::svg(
447447
open_app
@@ -474,7 +474,8 @@ fn workspace_overview() -> Section<crate::pages::Message> {
474474
.descriptions(descriptions)
475475
.view::<Page>(move |_binder, page, section| {
476476
let descriptions = &section.descriptions;
477-
settings::view_section(&section.title)
477+
settings::section()
478+
.title(&section.title)
478479
.add(
479480
settings::item::builder(&descriptions[show_number])
480481
.toggler(page.show_workspace_name, Message::SetShowName),

0 commit comments

Comments
 (0)